You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2011/04/19 05:42:38 UTC
svn commit: r1094849 - in /geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment: EjbModule.java EjbModuleBuilder.java

Author: xuhaihong
Date: Tue Apr 19 03:42:38 2011
New Revision: 1094849

URL: http://svn.apache.org/viewvc?rev=1094849&view=rev
Log:
Make sure the temp classloader and its parent are both destroyed

Modified:
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModule.java
    geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModule.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModule.java?rev=1094849&r1=1094848&r2=1094849&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModule.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModule.java Tue Apr 19 03:42:38 2011
@@ -125,6 +125,7 @@ public class EjbModule extends EJBModule
 
     @Override
     public void close() {
+        ClassLoaderUtil.destroyClassLoader(ejbModule.getClassLoader().getParent());
         ClassLoaderUtil.destroyClassLoader(ejbModule.getClassLoader());
         super.close();
     }

Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=1094849&r1=1094848&r2=1094849&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Tue Apr 19 03:42:38 2011
@@ -16,10 +16,6 @@
  */
 package org.apache.geronimo.openejb.deployment;
 
-import javax.ejb.EntityContext;
-import javax.ejb.TimerService;
-import javax.xml.namespace.QName;
-import javax.xml.ws.WebServiceContext;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -41,6 +37,11 @@ import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 
+import javax.ejb.EntityContext;
+import javax.ejb.TimerService;
+import javax.xml.namespace.QName;
+import javax.xml.ws.WebServiceContext;
+
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.connector.wrapper.ResourceAdapterWrapperGBean;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
@@ -1234,7 +1235,8 @@ public class EjbModuleBuilder implements
     private void releaseTempClassLoader(ClassLoader classLoader) {
         if (classLoader != null)
             try {
-                ClassLoaderUtil.destroyClassLoader(classLoader);
+                    ClassLoaderUtil.destroyClassLoader(classLoader.getParent());
+                    ClassLoaderUtil.destroyClassLoader(classLoader);
             } catch (Exception e) {
             }
     }