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

[kkolinko]

Author: kkolinko
Date: Fri May 31 11:07:18 2013
New Revision: 1488152

URL: http://svn.apache.org/r1488152
Log:
Merged revision 1488151 from tomcat/trunk:
(Reviewing r1485114)
Make antiLockingDocBase an absolute path.
It is very unlikely that java.io.tmpdir is not an absolute path. For 
consistency, convert it to the absolute form just once, so the path used when 
starting and stopping the webapp is certainly the same.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1488151

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=1488152&r1=1488151&r2=1488152&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 
Fri May 31 11:07:18 2013
@@ -231,7 +231,8 @@ public class ContextConfig implements Li
 
 
     /**
-     * Anti-locking docBase
+     * Anti-locking docBase. It is a path to a copy of the web application
+     * in the java.io.tmpdir directory. This path is always an absolute one.
      */
     private File antiLockingDocBase = null;
 
@@ -803,16 +804,17 @@ public class ContextConfig implements Li
                         System.getProperty("java.io.tmpdir"),
                         deploymentCount++ + "-" + docBase);
             }
+            antiLockingDocBase = antiLockingDocBase.getAbsoluteFile();
 
             if (log.isDebugEnabled())
                 log.debug("Anti locking context[" + context.getName()
                         + "] setting docBase to " +
-                        antiLockingDocBase.getAbsolutePath());
+                        antiLockingDocBase.getPath());
 
             // Cleanup just in case an old deployment is lying around
             ExpandWar.delete(antiLockingDocBase);
             if (ExpandWar.copy(docBaseFile, antiLockingDocBase)) {
-                context.setDocBase(antiLockingDocBase.getAbsolutePath());
+                context.setDocBase(antiLockingDocBase.getPath());
             }
         }
     }



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