Author: kkolinko
Date: Thu Mar 4 08:05:36 2010
New Revision: 918885
URL: http://svn.apache.org/viewvc?rev=918885&view=rev
Log:
Fix 1. of https://issues.apache.org/bugzilla/show_bug.cgi?id=48831#c3
Ignore the reset() call from java.util.logging.LogManager.Cleaner,
because we have our own shutdown hook that will take care.
There are three hooks that run at VM shutdown:
1. j.u.l.LogManager.Cleaner
2. o.a.j.ClassLoaderLogManager.Cleaner
3. o.a.c.startup.Catalina.CatalinaShutdownHook
2. vs. 3. was taken care by r910974 and r918594. This takes care of 1. vs.
(2.,3.)
Modified:
tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
Modified: tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java?rev=918885&r1=918884&r2=918885&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java (original)
+++ tomcat/trunk/java/org/apache/juli/ClassLoaderLogManager.java Thu Mar 4
08:05:36 2010
@@ -302,8 +302,14 @@
@Override
public void reset() throws SecurityException {
- ClassLoader classLoader = Thread.currentThread()
- .getContextClassLoader();
+ Thread thread = Thread.currentThread();
+ if (thread.getClass().getName().startsWith(
+ "java.util.logging.LogManager$")) {
+ // Ignore the call from java.util.logging.LogManager.Cleaner,
+ // because we have our own shutdown hook
+ return;
+ }
+ ClassLoader classLoader = thread.getContextClassLoader();
ClassLoaderLogInfo clLogInfo = getClassLoaderInfo(classLoader);
resetLoggers(clLogInfo);
super.reset();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
