From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 8 Oct 2010 12:21:55 +0000 (+0000)
Subject: Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48716
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=6510fc9ab0bb2c39846d2a6459ce6ad93c090237;p=tomcat7.0

Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48716
Don't call reset if the default LngManager is in use

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

diff --git a/java/org/apache/juli/logging/LogFactory.java b/java/org/apache/juli/logging/LogFactory.java
index 63fd87b6d..8f6f544f1 100644
--- a/java/org/apache/juli/logging/LogFactory.java
+++ b/java/org/apache/juli/logging/LogFactory.java
@@ -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();
+        }
     }