svn commit: r1439862 - in /tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb: ClassLoaderUtil.java assembler/DeployerEjb.java assembler/classic/Assembler.java

[andygumbrecht]

Author: andygumbrecht
Date: Tue Jan 29 12:38:25 2013
New Revision: 1439862

URL: http://svn.apache.org/viewvc?rev=1439862&view=rev
Log:
Don't use AppInfo object.

Modified:
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
    
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java?rev=1439862&r1=1439861&r2=1439862&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/ClassLoaderUtil.java
 Tue Jan 29 12:38:25 2013
@@ -61,9 +61,9 @@ public class ClassLoaderUtil {
     private static final Map<ClassLoader, Set<String>> appsByClassLoader = new 
HashMap<ClassLoader, Set<String>>();
     private static final UrlCache localUrlCache = new UrlCache();
 
-    public static void destroyClassLoader(final AppInfo info) {
-        destroyClassLoader(info.appId);
-        destroyClassLoader(info.path);
+    public static void destroyClassLoader(final String appId, final String 
appPath) {
+        destroyClassLoader(appId);
+        destroyClassLoader(appPath);
     }
 
     public static ClassLoader getContextClassLoader() {

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java?rev=1439862&r1=1439861&r2=1439862&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
 Tue Jan 29 12:38:25 2013
@@ -228,7 +228,7 @@ public class DeployerEjb implements Depl
             }
 
             if (null != appInfo) {
-                ClassLoaderUtil.destroyClassLoader(appInfo);
+                ClassLoaderUtil.destroyClassLoader(appInfo.appId, 
appInfo.path);
             }
 
             LOGGER.error("Can't deploy " + inLocation, e);

Modified: 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1439862&r1=1439861&r2=1439862&view=diff
==============================================================================
--- 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 (original)
+++ 
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 Tue Jan 29 12:38:25 2013
@@ -1527,7 +1527,7 @@ public class Assembler extends Assembler
 
         containerSystem.removeAppContext(appInfo.appId);
 
-        ClassLoaderUtil.destroyClassLoader(appInfo);
+        ClassLoaderUtil.destroyClassLoader(appInfo.appId, appInfo.path);
 
         if (undeployException.getCauses().size() > 0) {
             throw undeployException;