Author: violetagg
Date: Tue Apr 16 13:51:06 2013
New Revision: 1468415
URL: http://svn.apache.org/r1468415
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=54851
Directories without any web.xml fragments should not impact the status of
distributable. Patch provided by Trask Stalnaker.
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=1468415&r1=1468414&r2=1468415&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue Apr 16
13:51:06 2013
@@ -2574,6 +2574,10 @@ public class ContextConfig implements Li
new
InputSource(fragmentFile.toURI().toURL().toString());
source.setByteStream(stream);
parseWebXml(source, fragment, true);
+ } else {
+ // If there is no web.xml, normal folder no impact on
+ // distributable
+ fragment.setDistributable(true);
}
} finally {
fragment.setURL(file.toURI().toURL());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
