You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jg...@apache.org on 2005/08/31 05:02:11 UTC

svn commit: r264928 - in /geronimo/trunk/modules: jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java

Author: jgenender
Date: Tue Aug 30 20:02:07 2005
New Revision: 264928

URL: http://svn.apache.org/viewcvs?rev=264928&view=rev
Log:
Fix for GERONIMO-484 for logging memory leak

Modified:
    geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
    geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java

Modified: geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java?rev=264928&r1=264927&r2=264928&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java (original)
+++ geronimo/trunk/modules/jetty/src/java/org/apache/geronimo/jetty/JettyWebAppContext.java Tue Aug 30 20:02:07 2005
@@ -352,6 +352,10 @@
             leaveContextScope(null, null, context);
             jettyContainer.removeContext(this);
         }
+
+        // No more logging will occur for this ClassLoader. Inform the LogFactory to avoid a memory leak.
+        LogFactory.release(webClassLoader);
+        
         log.info("JettyWebAppContext stopped");
     }
 

Modified: geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?rev=264928&r1=264927&r2=264928&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java (original)
+++ geronimo/trunk/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java Tue Aug 30 20:02:07 2005
@@ -379,11 +379,17 @@
     public void doStop() throws Exception {
         container.removeContext(this);
 
+        // No more logging will occur for this ClassLoader. Inform the LogFactory to avoid a memory leak.
+        LogFactory.release(webClassLoader);
+
         log.info("TomcatWebAppContext stopped");
     }
 
     public void doFail() {
         container.removeContext(this);
+
+        // No more logging will occur for this ClassLoader. Inform the LogFactory to avoid a memory leak.
+        LogFactory.release(webClassLoader);
 
         log.info("TomcatWebAppContext failed");
     }