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

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 6ae2533..4763662 100644 (file)
--- 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;
     }
 
     /**