From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 11 Jun 2006 21:53:53 +0000 (+0000)
Subject: Port fix for bug 39769. Remove the classloader switching from unload. It was removed... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=dd50eaea8fa672f716491f296b5704f6c9ad9db2;p=tomcat7.0

Port fix for bug 39769. Remove the classloader switching from unload. It was removed from load some time ago. Patch provided by David Gagnon.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@413540 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/core/StandardWrapper.java b/java/org/apache/catalina/core/StandardWrapper.java
index c9e9a78d5..50cb19958 100644
--- a/java/org/apache/catalina/core/StandardWrapper.java
+++ b/java/org/apache/catalina/core/StandardWrapper.java
@@ -1344,10 +1344,6 @@ public class StandardWrapper
             }
         }
 
-        ClassLoader oldCtxClassLoader =
-            Thread.currentThread().getContextClassLoader();
-        ClassLoader classLoader = instance.getClass().getClassLoader();
-
         PrintStream out = System.out;
         if (swallowOutput) {
             SystemLogHandler.startCapture();
@@ -1358,7 +1354,6 @@ public class StandardWrapper
             instanceSupport.fireInstanceEvent
               (InstanceEvent.BEFORE_DESTROY_EVENT, instance);
 
-            Thread.currentThread().setContextClassLoader(classLoader);
             if( System.getSecurityManager() != null) {
                 SecurityUtil.doAsPrivilege("destroy",
                                            instance);
@@ -1387,8 +1382,6 @@ public class StandardWrapper
                 (sm.getString("standardWrapper.destroyException", getName()),
                  t);
         } finally {
-            // restore the context ClassLoader
-            Thread.currentThread().setContextClassLoader(oldCtxClassLoader);
             // Write captured output
             if (swallowOutput) {
                 String log = SystemLogHandler.stopCapture();
@@ -1407,7 +1400,6 @@ public class StandardWrapper
 
         if (singleThreadModel && (instancePool != null)) {
             try {
-                Thread.currentThread().setContextClassLoader(classLoader);
                 while (!instancePool.isEmpty()) {
                     Servlet s = (Servlet) instancePool.pop();
                     if (System.getSecurityManager() != null) {
@@ -1429,10 +1421,6 @@ public class StandardWrapper
                 throw new ServletException
                     (sm.getString("standardWrapper.destroyException",
                                   getName()), t);
-            } finally {
-                // restore the context ClassLoader
-                Thread.currentThread().setContextClassLoader
-                    (oldCtxClassLoader);
             }
             instancePool = null;
             nInstances = 0;