svn commit: r1569410 - /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java

[jlmonteiro]

Author: jlmonteiro
Date: Tue Feb 18 16:23:12 2014
New Revision: 1569410

URL: http://svn.apache.org/r1569410
Log:
Tomcat 7.0.52 new fix from Romain

Modified:
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java?rev=1569410&r1=1569409&r2=1569410&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
 Tue Feb 18 16:23:12 2014
@@ -22,6 +22,7 @@ import org.apache.openejb.OpenEJB;
 import org.apache.openejb.classloader.ClassLoaderConfigurer;
 import org.apache.openejb.classloader.WebAppEnricher;
 import org.apache.openejb.config.NewLoaderLogic;
+import org.apache.openejb.loader.Files;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.util.LogCategory;
 import org.apache.openejb.util.Logger;
@@ -232,13 +233,15 @@ public class LazyStopWebappClassLoader e
         return !SystemInstance.get().getOptions().get(TOMEE_WEBAPP_FIRST, 
true);
     }
 
-    @Override
+
     public Enumeration<URL> getResources(final String name) throws IOException 
{
         if 
("META-INF/services/javax.servlet.ServletContainerInitializer".equals(name)) {
             final Collection<URL> list = new 
ArrayList<URL>(Collections.list(super.getResources(name)));
             final Iterator<URL> it = list.iterator();
             while (it.hasNext()) {
-                if (NewLoaderLogic.skip(it.next())) {
+                final URL next = it.next();
+                final File file = Files.toFile(next);
+                if (!file.isFile() && NewLoaderLogic.skip(next)) {
                     it.remove();
                 }
             }