You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/05/22 10:42:14 UTC
svn commit: r1485114 -
/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Author: markt
Date: Wed May 22 08:42:14 2013
New Revision: 1485114
URL: http://svn.apache.org/r1485114
Log:
Clean-up / simplify based on review by kkolinko.
Modified:
tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java?rev=1485114&r1=1485113&r2=1485114&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Wed May 22 08:42:14 2013
@@ -215,7 +215,7 @@ public class ContextConfig implements Li
/**
* Anti-locking docBase
*/
- private String antiLockingDocBase = null;
+ private File antiLockingDocBase = null;
/**
@@ -727,28 +727,28 @@ 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());
}
}
-
}
@@ -993,15 +993,9 @@ public class ContextConfig implements Li
}
// Remove (partially) folders and files created by antiLocking
- Host host = (Host) context.getParent();
- String docBase = context.getDocBase();
if (antiLockingDocBase != null) {
- File docBaseFile = new File(antiLockingDocBase);
- if (!docBaseFile.isAbsolute()) {
- docBaseFile = new File(host.getAppBaseFile(), 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org