tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1577201 - /tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
Date Thu, 13 Mar 2014 15:33:14 GMT
Author: markt
Date: Thu Mar 13 15:33:14 2014
New Revision: 1577201

URL: http://svn.apache.org/r1577201
Log:
Clean-up / consistency

Modified:
    tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java

Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1577201&r1=1577200&r2=1577201&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Thu Mar 13 15:33:14
2014
@@ -179,13 +179,6 @@ public class ManagerServlet extends Http
 
 
     /**
-     * File object representing the directory into which the deploy() command
-     * will deploy uploaded WAR files (normally the appBase).
-     */
-    protected File deployed = null;
-
-
-    /**
      * Path used to store revisions of webapps.
      */
     protected File versioned = null;
@@ -470,9 +463,6 @@ public class ManagerServlet extends Http
         versioned = (File) getServletContext().getAttribute
             (ServletContext.TEMPDIR);
 
-        // Identify the appBase of the owning Host of this Context
-        // (if any)
-        deployed = ((Host) context.getParent()).getAppBaseFile();
         configBase = new File(context.getCatalinaBase(), "conf");
         Container container = context;
         Container host = null;
@@ -666,7 +656,7 @@ public class ManagerServlet extends Http
             return;
         }
 
-        File deployedWar = new File(deployed, baseName + ".war");
+        File deployedWar = new File(host.getAppBaseFile(), baseName + ".war");
 
         // Determine full path for uploaded WAR
         File uploadedWar;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message