Author: markt
Date: Tue Mar 3 11:33:08 2015
New Revision: 1663669
URL: http://svn.apache.org/r1663669
Log:
Remove duplication.
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=1663669&r1=1663668&r2=1663669&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Mar 3
11:33:08 2015
@@ -613,8 +613,8 @@ public class ContextConfig implements Li
}
if (docBase.toLowerCase(Locale.ENGLISH).endsWith(".war") &&
!file.isDirectory()) {
+ URL war = new URL("jar:" + (new File(docBase)).toURI().toURL() +
"!/");
if (unpackWARs) {
- URL war = new URL("jar:" + (new File(docBase)).toURI().toURL()
+ "!/");
docBase = ExpandWar.expand(host, war, pathName);
file = new File(docBase);
docBase = file.getCanonicalPath();
@@ -622,8 +622,6 @@ public class ContextConfig implements Li
((StandardContext)
context).setOriginalDocBase(origDocBase);
}
} else {
- URL war =
- new URL("jar:" + (new File (docBase)).toURI().toURL()
+ "!/");
ExpandWar.validate(host, war, pathName);
}
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
