Author: markt
Date: Fri Dec 11 17:04:36 2009
New Revision: 889701
URL: http://svn.apache.org/viewvc?rev=889701&view=rev
Log:
JARs without any web.xml fragments should not impact the status of distributable
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=889701&r1=889700&r2=889701&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Fri Dec 11
17:04:36 2009
@@ -1866,7 +1866,11 @@
jarFile = urlConn.getJarFile();
JarEntry fragmentEntry =
jarFile.getJarEntry(FRAGMENT_LOCATION);
- if (fragmentEntry != null) {
+ if (fragmentEntry == null) {
+ // If there is no web.xml, normal JAR no impact on
+ // distributable
+ fragment.setDistributable(true);
+ } else {
stream = jarFile.getInputStream(fragmentEntry);
InputSource source = new InputSource(
urlConn.getJarFileURL().toString() +
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
