From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 10 Oct 2009 18:16:51 +0000 (+0000)
Subject: Refactor upload into its own method in preparation for moving some commands from... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=fa0f1c1dc58745cc19b3eff0a3e0aac79853ad32;p=tomcat7.0

Refactor upload into its own method in preparation for moving some commands from GET to POST.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@823910 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/manager/HTMLManagerServlet.java b/java/org/apache/catalina/manager/HTMLManagerServlet.java
index 6ae2533d2..476366264 100644
--- a/java/org/apache/catalina/manager/HTMLManagerServlet.java
+++ b/java/org/apache/catalina/manager/HTMLManagerServlet.java
@@ -178,6 +178,12 @@ public final class HTMLManagerServlet extends ManagerServlet {
         // Prepare our output writer to generate the response message
         response.setContentType("text/html; charset=" + Constants.CHARSET);
 
+        String message = upload(request);
+
+        list(request, response, message);
+    }
+
+    protected String upload(HttpServletRequest request) throws IOException {
         String message = "";
 
         // Create a new file upload handler
@@ -274,8 +280,7 @@ public final class HTMLManagerServlet extends ManagerServlet {
             }
             warUpload = null;
         }
-
-        list(request, response, message);
+        return message;
     }
 
     /**