You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/11/22 14:53:00 UTC

svn commit: r1412553 - /openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java

Author: rmannibucau
Date: Thu Nov 22 13:52:59 2012
New Revision: 1412553

URL: http://svn.apache.org/viewvc?rev=1412553&view=rev
Log:
regression from 1.5.0 - some logs were swallowed when the container we stopped

Modified:
    openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java

Modified: openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java?rev=1412553&r1=1412552&r2=1412553&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/LazyStopWebappClassLoader.java Thu Nov 22 13:52:59 2012
@@ -88,7 +88,15 @@ public class LazyStopWebappClassLoader e
 
     public void internalStop() throws LifecycleException {
         if (isStarted()) {
-            super.stop();
+            // reset classloader because of tomcat classloaderlogmanager
+            // to be sure we reset the right loggers
+            final ClassLoader loader = Thread.currentThread().getContextClassLoader();
+            Thread.currentThread().setContextClassLoader(this);
+            try {
+                super.stop();
+            } finally {
+                Thread.currentThread().setContextClassLoader(loader);
+            }
         }
     }