Author: markt
Date: Fri Oct 8 12:21:55 2010
New Revision: 1005802
URL: http://svn.apache.org/viewvc?rev=1005802&view=rev
Log:
Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48716
Don't call reset if the default LngManager is in use
Modified:
tomcat/trunk/java/org/apache/juli/logging/LogFactory.java
Modified: tomcat/trunk/java/org/apache/juli/logging/LogFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/LogFactory.java?rev=1005802&r1=1005801&r2=1005802&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/logging/LogFactory.java (original)
+++ tomcat/trunk/java/org/apache/juli/logging/LogFactory.java Fri Oct 8
12:21:55 2010
@@ -323,8 +323,13 @@ public /* abstract */ class LogFactory {
*/
public static void release(
@SuppressWarnings("unused") ClassLoader classLoader) {
- // JULI's log manager looks at the current classLoader
- LogManager.getLogManager().reset();
+ // JULI's log manager looks at the current classLoader, the default
+ // implementation does not so calling reset in that case will break
+ // things
+ if (!LogManager.getLogManager().getClass().getName().equals(
+ "java.util.logging.LogManager")) {
+ LogManager.getLogManager().reset();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
