Fixing compile issues after merge
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e2b1fe6c Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e2b1fe6c Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e2b1fe6c Branch: refs/heads/tomee-1.7.x Commit: e2b1fe6c135f57c0ce1b9ec9b5bccad463863295 Parents: 75700f3 Author: Jonathan Gallimore <j...@jrg.me.uk> Authored: Fri Jan 30 10:47:22 2015 +0000 Committer: Jonathan Gallimore <j...@jrg.me.uk> Committed: Fri Jan 30 10:47:22 2015 +0000 ---------------------------------------------------------------------- .../catalina/LazyStopWebappClassLoader.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/e2b1fe6c/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java ---------------------------------------------------------------------- diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java index 5411a7b..672cd66 100644 --- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java +++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java @@ -27,7 +27,9 @@ import org.apache.openejb.loader.Files; import org.apache.openejb.loader.SystemInstance; import org.apache.openejb.util.LogCategory; import org.apache.openejb.util.Logger; +import org.apache.openejb.util.URLs; import org.apache.openejb.util.classloader.URLClassLoaderFirst; +import org.apache.openejb.core.ParentClassLoaderFinder; import java.io.File; import java.io.IOException; @@ -41,6 +43,7 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; +import java.util.Map; public class LazyStopWebappClassLoader extends WebappClassLoader { private static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB, LazyStopWebappClassLoader.class.getName()); @@ -48,14 +51,8 @@ public class LazyStopWebappClassLoader extends WebappClassLoader { private static final ThreadLocal<Context> CONTEXT = new ThreadLocal<Context>(); public static final String TOMEE_WEBAPP_FIRST = "tomee.webapp-first"; - - static { - boolean result = ClassLoader.registerAsParallelCapable(); - if (!result) { - LOGGER.warning("Can't register // tomee webapp classloader"); - } - } - + public static final String CLASS_EXTENSION = ".class"; + private boolean restarting; private final boolean forceStopPhase = Boolean.parseBoolean(SystemInstance.get().getProperty("tomee.webappclassloader.force-stop-phase", "false")); private ClassLoaderConfigurer configurer; @@ -64,6 +61,7 @@ public class LazyStopWebappClassLoader extends WebappClassLoader { private volatile boolean originalDelegate; private final int hashCode; private Collection<File> additionalRepos; + private final Map<String, Boolean> filterTempCache = new HashMap<String, Boolean>(); // used only in sync block + isEar public LazyStopWebappClassLoader() { j2seClassLoader = getSystemClassLoader(); @@ -78,6 +76,9 @@ public class LazyStopWebappClassLoader extends WebappClassLoader { j2seClassLoader = getSystemClassLoader(); hashCode = construct(); setJavaseClassLoader(getSystemClassLoader()); + containerClassLoader = ParentClassLoaderFinder.Helper.get(); + isEar = getParent() != containerClassLoader; + originalDelegate = getDelegate(); } private int construct() { @@ -136,7 +137,7 @@ public class LazyStopWebappClassLoader extends WebappClassLoader { return super.loadClass(name); } } else if (name.startsWith("javax.faces.") || name.startsWith("org.apache.webbeans.jsf.")) { - synchronized (this) { + synchronized (this) { delegate = false; try { return super.loadClass(name);