From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 11 Dec 2009 17:04:36 +0000 (+0000)
Subject: JARs without any web.xml fragments should not impact the status of distributable
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=6d773d566b24096edde41e1dc9d2babb84d73080;p=tomcat7.0

JARs without any web.xml fragments should not impact the status of distributable

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@889701 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/startup/ContextConfig.java b/java/org/apache/catalina/startup/ContextConfig.java
index 0b2cc1af8..877b356d8 100644
--- a/java/org/apache/catalina/startup/ContextConfig.java
+++ b/java/org/apache/catalina/startup/ContextConfig.java
@@ -1866,7 +1866,11 @@ public class ContextConfig
                 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() +