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

452201 EnvConfiguration.destroy() should set the classloader

This commit is contained in:
Jan Bartel 2014-11-19 17:49:16 +11:00
parent 9792cec6db
commit a0f6d07847
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/EnvConfiguration.java
View File

@ -185,9 +185,14 @@ public class EnvConfiguration extends AbstractConfiguration
@Override @Override
public void destroy (WebAppContext context) throws Exception public void destroy (WebAppContext context) throws Exception
{ {
ClassLoader old_loader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(context.getClassLoader());
ContextFactory.associateClassLoader(context.getClassLoader());
try try
{ {
//unbind any NamingEntries that were configured in this webapp's name space //unbind any NamingEntries that were configured in this webapp's name space
NamingContext scopeContext = (NamingContext)NamingEntryUtil.getContextForScope(context); NamingContext scopeContext = (NamingContext)NamingEntryUtil.getContextForScope(context);
scopeContext.getParent().destroySubcontext(scopeContext.getName()); scopeContext.getParent().destroySubcontext(scopeContext.getName());
} }
@ -196,6 +201,11 @@ public class EnvConfiguration extends AbstractConfiguration
LOG.ignore(e); LOG.ignore(e);
LOG.debug("No naming entries configured in environment for webapp "+context); LOG.debug("No naming entries configured in environment for webapp "+context);
} }
finally
{
ContextFactory.disassociateClassLoader();
Thread.currentThread().setContextClassLoader(old_loader);
}
} }
/** /**