svn commit: r1485117 - /tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java

[markt]

Author: markt
Date: Wed May 22 08:46:58 2013
New Revision: 1485117

URL: http://svn.apache.org/r1485117
Log:
Clean-up / simplify based on review by kkolinko.

Modified:
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1485117&r1=1485116&r2=1485117&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java 
Wed May 22 08:46:58 2013
@@ -233,7 +233,7 @@ public class ContextConfig implements Li
     /**
      * Anti-locking docBase
      */
-    private String antiLockingDocBase = null;
+    private File antiLockingDocBase = null;
 
 
     /**
@@ -794,27 +794,27 @@ public class ContextConfig implements Li
             ContextName cn = new ContextName(path, context.getWebappVersion());
             docBase = cn.getBaseName();
 
-            File file = null;
             if (originalDocBase.toLowerCase(Locale.ENGLISH).endsWith(".war")) {
-                file = new File(System.getProperty("java.io.tmpdir"),
+                antiLockingDocBase = new File(
+                        System.getProperty("java.io.tmpdir"),
                         deploymentCount++ + "-" + docBase + ".war");
             } else {
-                file = new File(System.getProperty("java.io.tmpdir"),
+                antiLockingDocBase = new File(
+                        System.getProperty("java.io.tmpdir"),
                         deploymentCount++ + "-" + docBase);
             }
 
             if (log.isDebugEnabled())
                 log.debug("Anti locking context[" + context.getName()
-                        + "] setting docBase to " + file);
+                        + "] setting docBase to " +
+                        antiLockingDocBase.getAbsolutePath());
 
-            antiLockingDocBase = file.getAbsolutePath();
             // Cleanup just in case an old deployment is lying around
-            ExpandWar.delete(file);
-            if (ExpandWar.copy(docBaseFile, file)) {
-                context.setDocBase(antiLockingDocBase);
+            ExpandWar.delete(antiLockingDocBase);
+            if (ExpandWar.copy(docBaseFile, antiLockingDocBase)) {
+                context.setDocBase(antiLockingDocBase.getAbsolutePath());
             }
         }
-
     }
 
 
@@ -1056,16 +1056,9 @@ public class ContextConfig implements Li
         }
 
         // Remove (partially) folders and files created by antiLocking
-        Host host = (Host) context.getParent();
-        String appBase = host.getAppBase();
-        String docBase = context.getDocBase();
         if (antiLockingDocBase != null) {
-            File docBaseFile = new File(antiLockingDocBase);
-            if (!docBaseFile.isAbsolute()) {
-                docBaseFile = new File(appBase, docBase);
-            }
             // No need to log failure - it is expected in this case
-            ExpandWar.delete(docBaseFile, false);
+            ExpandWar.delete(antiLockingDocBase, false);
         }
 
         // Reset ServletContextInitializer scanning



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