Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2015-01-01 06:03:21 -0500
committerJan Bartel2015-01-01 06:05:03 -0500
commitc92712779b8da4dd922eb20ac4a22b568656dde9 (patch)
tree5d230f63bfacb072b317d6f9216e28c1fc5ab213 /jetty-plus
parent451e27e7369e6d75088926ab753aa7d53e3d18b7 (diff)
downloadorg.eclipse.jetty.project-c92712779b8da4dd922eb20ac4a22b568656dde9.tar.gz
org.eclipse.jetty.project-c92712779b8da4dd922eb20ac4a22b568656dde9.tar.xz
org.eclipse.jetty.project-c92712779b8da4dd922eb20ac4a22b568656dde9.zip
456426 Exception on context undeploy from EnvConfiguration
Diffstat (limited to 'jetty-plus')
-rw-r--r--jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/EnvConfiguration.java14
1 files changed, 4 insertions, 10 deletions
diff --git a/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/EnvConfiguration.java b/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/EnvConfiguration.java
index 6db338eacc..fc5b5ef380 100644
--- a/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/EnvConfiguration.java
+++ b/jetty-plus/src/main/java/org/eclipse/jetty/plus/webapp/EnvConfiguration.java
@@ -185,26 +185,20 @@ public class EnvConfiguration extends AbstractConfiguration
@Override
public void destroy (WebAppContext context) throws Exception
{
- ClassLoader old_loader = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader(context.getClassLoader());
- ContextFactory.associateClassLoader(context.getClassLoader());
-
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);
scopeContext.getParent().destroySubcontext(scopeContext.getName());
}
catch (NameNotFoundException e)
{
LOG.ignore(e);
- LOG.debug("No naming entries configured in environment for webapp "+context);
+ LOG.debug("No jndi entries scoped to webapp {}", context);
}
- finally
+ catch (NamingException e)
{
- ContextFactory.disassociateClassLoader();
- Thread.currentThread().setContextClassLoader(old_loader);
+ LOG.debug("Error unbinding jndi entries scoped to webapp "+context, e);
}
}

Back to the top