Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48716

Provide an undocumented 'shoot yourself in the foot' option to disable the JULI logging reset

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

diff --git a/java/org/apache/catalina/loader/WebappClassLoader.java b/java/org/apache/catalina/loader/WebappClassLoader.java
index 18e2472..e9adf34 100644 (file)
--- a/java/org/apache/catalina/loader/WebappClassLoader.java
+++ b/java/org/apache/catalina/loader/WebappClassLoader.java
@@ -436,6 +436,14 @@ public class WebappClassLoader
      */
     private boolean clearReferencesStopThreads = false;
 
+    /**
+     * Should Tomcat call {@link org.apache.juli.logging.LogFactory#release()}
+     * when the class loader is stopped? If not specified, the default value
+     * of <code>true</code> is used. Changing the default setting is likely to
+     * lead to memory leaks and other issues.
+     */
+    private boolean clearReferencesLogFactoryRelease = true;
+
     // ------------------------------------------------------------- Properties
 
 
@@ -638,6 +646,26 @@ public class WebappClassLoader
      }
 
 
+     /**
+      * Return the clearReferencesLogFactoryRelease flag for this Context.
+      */
+     public boolean getClearReferencesLogFactoryRelease() {
+         return (this.clearReferencesLogFactoryRelease);
+     }
+
+
+     /**
+      * Set the clearReferencesLogFactoryRelease feature for this Context.
+      *
+      * @param clearReferencesLogFactoryRelease The new flag value
+      */
+     public void setClearReferencesLogFactoryRelease(
+             boolean clearReferencesLogFactoryRelease) {
+         this.clearReferencesLogFactoryRelease =
+             clearReferencesLogFactoryRelease;
+     }
+
+
     // ------------------------------------------------------- Reloader Methods
 
 
@@ -1741,7 +1769,9 @@ public class WebappClassLoader
         IntrospectionUtils.clear();
         
         // Clear the classloader reference in common-logging
-        org.apache.juli.logging.LogFactory.release(this);
+        if (clearReferencesLogFactoryRelease) {
+            org.apache.juli.logging.LogFactory.release(this);
+        }
         
         // Clear the classloader reference in the VM's bean introspector
         java.beans.Introspector.flushCaches();