geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r511287 - in /geronimo/server/trunk/modules: geronimo-jetty6/ geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/ geronimo-tomcat6/ geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/
Date Sat, 24 Feb 2007 15:39:03 GMT
Author: kevan
Date: Sat Feb 24 07:39:02 2007
New Revision: 511287

URL: http://svn.apache.org/viewvc?view=rev&rev=511287
Log:
GERONIMO-2885 During undeploy, need to call javax.faces.FactoryFinder.releaseFactories() to
clean up references to application ClassLoaders

Modified:
    geronimo/server/trunk/modules/geronimo-jetty6/pom.xml
    geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java
    geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java

Modified: geronimo/server/trunk/modules/geronimo-jetty6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/pom.xml?view=diff&rev=511287&r1=511286&r2=511287
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/pom.xml Sat Feb 24 07:39:02 2007
@@ -98,7 +98,12 @@
             <groupId>commons-primitives</groupId>
             <artifactId>commons-primitives</artifactId>
         </dependency>
-        
+
+        <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-api</artifactId>
+        </dependency>        
+
     </dependencies>
     
     <build>

Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java?view=diff&rev=511287&r1=511286&r2=511287
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java
(original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/main/java/org/apache/geronimo/jetty6/JettyWebAppContext.java
Sat Feb 24 07:39:02 2007
@@ -29,6 +29,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.faces.FactoryFinder;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import javax.naming.Context;
@@ -333,6 +334,9 @@
 
         // No more logging will occur for this ClassLoader. Inform the LogFactory to avoid
a memory leak.
         LogFactory.release(webClassLoader);
+
+        // need to release the JSF factories. Otherwise, we'll leak ClassLoaders.
+        FactoryFinder.releaseFactories();
 
         log.debug("JettyWebAppContext stopped");
     }

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml?view=diff&rev=511287&r1=511286&r2=511287
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/pom.xml Sat Feb 24 07:39:02 2007
@@ -119,6 +119,11 @@
             <artifactId>juli-adapters</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-api</artifactId>
+        </dependency>        
+
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java?view=diff&rev=511287&r1=511286&r2=511287
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatWebAppContext.java
Sat Feb 24 07:39:02 2007
@@ -28,6 +28,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.faces.FactoryFinder;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import javax.management.j2ee.statistics.Stats;
@@ -512,6 +513,9 @@
         // No more logging will occur for this ClassLoader. Inform the LogFactory to avoid
a memory leak.
 //        LogFactory.release(classLoader);
 
+        // need to release the JSF factories. Otherwise, we'll leak ClassLoaders.
+        FactoryFinder.releaseFactories();
+        
         log.debug("TomcatWebAppContext stopped");
     }
 
@@ -521,6 +525,9 @@
 
         // No more logging will occur for this ClassLoader. Inform the LogFactory to avoid
a memory leak.
 //        LogFactory.release(classLoader);
+
+        // need to release the JSF factories. Otherwise, we'll leak ClassLoaders.
+        FactoryFinder.releaseFactories();
 
         log.warn("TomcatWebAppContext failed");
     }



Mime
View raw message