Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

478247 WebappClassLoader pinned after redeploy

This commit is contained in:
Jan Bartel 2015-09-24 14:02:46 +10:00
parent 382c8e3738
commit 06fbf447fb
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
View File

@ -853,6 +853,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
_availability = Availability.UNAVAILABLE; _availability = Availability.UNAVAILABLE;
ClassLoader old_classloader = null; ClassLoader old_classloader = null;
ClassLoader old_webapploader = null;
Thread current_thread = null; Thread current_thread = null;
Context old_context = __context.get(); Context old_context = __context.get();
@ -862,6 +863,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
// Set the classloader // Set the classloader
if (_classLoader != null) if (_classLoader != null)
{ {
old_webapploader = _classLoader;
current_thread = Thread.currentThread(); current_thread = Thread.currentThread();
old_classloader = current_thread.getContextClassLoader(); old_classloader = current_thread.getContextClassLoader();
current_thread.setContextClassLoader(_classLoader); current_thread.setContextClassLoader(_classLoader);
@ -885,7 +887,7 @@ public class ContextHandler extends ScopedHandler implements Attributes, Gracefu
LOG.info("Stopped {}", this); LOG.info("Stopped {}", this);
__context.set(old_context); __context.set(old_context);
// reset the classloader // reset the classloader
if (_classLoader != null && current_thread!=null) if ((old_classloader == null || (old_classloader != old_webapploader)) && current_thread != null)
current_thread.setContextClassLoader(old_classloader); current_thread.setContextClassLoader(old_classloader);
} }