Author: kkolinko
Date: Fri Sep 12 22:34:40 2014
New Revision: 1624664
URL: http://svn.apache.org/r1624664
Log:
Reorganize branches for better performance.
The "docBase.toLowerCase(Locale.ENGLISH).endsWith(".war") &&
!file.isDirectory()" condition was the same in both branches.
It is merge of r1624657 from tomcat/trunk.
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:r1624657
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=1624664&r1=1624663&r2=1624664&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 Sep 12 22:34:40 2014
@@ -722,19 +722,20 @@ public class ContextConfig implements Li
}
}
- if (docBase.toLowerCase(Locale.ENGLISH).endsWith(".war") &&
!file.isDirectory() && unpackWARs) {
- URL war = new URL("jar:" + (new File(docBase)).toURI().toURL() +
"!/");
- docBase = ExpandWar.expand(host, war, pathName);
- file = new File(docBase);
- docBase = file.getCanonicalPath();
- if (context instanceof StandardContext) {
- ((StandardContext) context).setOriginalDocBase(origDocBase);
- }
- } else if (docBase.toLowerCase(Locale.ENGLISH).endsWith(".war") &&
- !file.isDirectory() && !unpackWARs) {
- URL war =
- new URL("jar:" + (new File (docBase)).toURI().toURL() + "!/");
- ExpandWar.validate(host, war, pathName);
+ if (docBase.toLowerCase(Locale.ENGLISH).endsWith(".war") &&
!file.isDirectory()) {
+ 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();
+ if (context instanceof StandardContext) {
+ ((StandardContext)
context).setOriginalDocBase(origDocBase);
+ }
+ } else {
+ URL war =
+ new URL("jar:" + (new File (docBase)).toURI().toURL()
+ "!/");
+ ExpandWar.validate(host, war, pathName);
+ }
} else {
File docDir = new File(docBase);
if (!docDir.exists()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
