openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1815027 - /openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/catalina/startup/MeecrowaveContextConfig.java
Date Sun, 12 Nov 2017 16:23:12 GMT
Author: rmannibucau
Date: Sun Nov 12 16:23:12 2017
New Revision: 1815027

URL: http://svn.apache.org/viewvc?rev=1815027&view=rev
Log:
MEECROWAVE-79 ensure we match tomcat webclasses key

Modified:
    openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/catalina/startup/MeecrowaveContextConfig.java

Modified: openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/catalina/startup/MeecrowaveContextConfig.java
URL: http://svn.apache.org/viewvc/openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/catalina/startup/MeecrowaveContextConfig.java?rev=1815027&r1=1815026&r2=1815027&view=diff
==============================================================================
--- openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/catalina/startup/MeecrowaveContextConfig.java
(original)
+++ openwebbeans/meecrowave/trunk/meecrowave-core/src/main/java/org/apache/catalina/startup/MeecrowaveContextConfig.java
Sun Nov 12 16:23:12 2017
@@ -202,7 +202,10 @@ public class MeecrowaveContextConfig ext
 
     private void processClasses(final WebXml fragment, final boolean handlesTypesOnly,
                                 final Map<String, JavaClassCacheEntry> javaClassCache,
final String key) {
-        final Collection<Class<?>> classes = webClasses.remove(key);
+        Collection<Class<?>> classes = webClasses.remove(key);
+        if (classes == null && key.endsWith(".jar") && key.startsWith("file:"))
{ // xbean vs o.a.tomcat.u.scan.JarFileUrlJar
+            classes = webClasses.remove("jar:" + key + "!/");
+        }
         if (classes != null && !classes.isEmpty()) {
             final ClassLoader loader = context.getLoader().getClassLoader();
             classes.forEach(c -> {



Mime
View raw message