Author: markt
Date: Tue May 3 18:17:54 2016
New Revision: 1742166
URL: http://svn.apache.org/viewvc?rev=1742166&view=rev
Log:
Fix regression in r1742146
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=1742166&r1=1742165&r2=1742166&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/ContextConfig.java Tue May 3
18:17:54 2016
@@ -1672,7 +1672,7 @@ public class ContextConfig implements Li
for (WebXml fragment : fragments) {
URL url = fragment.getURL();
try {
- if ("jar".equals(url.getProtocol())) {
+ if ("jar".equals(url.getProtocol()) ||
url.toString().endsWith(".jar")) {
try (Jar jar = JarFactory.newInstance(url)) {
jar.nextEntry();
String entryName = jar.getEntryName();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
