Author: rmannibucau Date: Wed Feb 19 06:26:47 2014 New Revision: 1569649 URL: http://svn.apache.org/r1569649 Log: getResource* protection against eager close
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=1569649&r1=1569648&r2=1569649&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 Wed Feb 19 06:26:47 2014 @@ -30,6 +30,7 @@ import org.apache.openejb.util.classload import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.net.MalformedURLException; @@ -233,8 +234,20 @@ public class LazyStopWebappClassLoader e return !SystemInstance.get().getOptions().get(TOMEE_WEBAPP_FIRST, true); } + @Override + public InputStream getResourceAsStream(final String name) { + if (!isStarted()) { + return null; + } + return super.getResourceAsStream(name); + } + @Override public Enumeration<URL> getResources(final String name) throws IOException { + if (!isStarted()) { + return null; + } + 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();