svn commit: r908754 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java

[markt]

Author: markt
Date: Wed Feb 10 23:36:51 2010
New Revision: 908754

URL: http://svn.apache.org/viewvc?rev=908754&view=rev
Log:
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
Modified:
    tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java

Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=908754&r1=908753&r2=908754&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Wed Feb 
10 23:36:51 2010
@@ -436,6 +436,14 @@
      */
     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 @@
      }
 
 
+     /**
+      * 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 @@
         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();



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org