[jboss-cvs] JBossAS SVN: r66093 - projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployers/temp.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2007-10-12 12:37:21 -0400 (Fri, 12 Oct 2007)
New Revision: 66093

Modified:
   projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployers/temp/ScopedNewClassLoaderDomain.java
Log:
[JBAOP-409] Tidy up code a bit


Modified: projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployers/temp/ScopedNewClassLoaderDomain.java
===================================================================
--- projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployers/temp/ScopedNewClassLoaderDomain.java	2007-10-12 16:31:37 UTC (rev 66092)
+++ projects/aop/trunk/asintegration/src/main/org/jboss/aop/deployers/temp/ScopedNewClassLoaderDomain.java	2007-10-12 16:37:21 UTC (rev 66093)
@@ -23,6 +23,7 @@
 
 
 import java.lang.ref.WeakReference;
+import java.net.URL;
 
 import org.jboss.aop.AspectManager;
 import org.jboss.aop.advice.AspectDefinition;
@@ -93,8 +94,9 @@
       aspect = super.getSuperPerVmAspect(def);
       if (aspect != null)
       {
-         ClassLoaderDomain loadingDomain = getAspectRepository(aspect);
-//         LoaderRepository myRepository = getScopedRepository();
+         Class superAspectClass = aspect.getClass();
+         ClassLoaderDomain loadingDomain = getAspectRepository(superAspectClass);
+
          ClassLoaderDomain myDomain = getClassLoaderDomain();
          
          if (loadingDomain == myDomain)
@@ -105,8 +107,9 @@
          else
          {
             //The class has been loaded by a parent domain, find out if we also have a copy
-            Class clazz = myDomain.loadClass(aspect.getClass().getName());
-            if (clazz == aspect.getClass())
+            Class myAspectClazz = myDomain.loadClass(aspect.getClass().getName());
+            
+            if (myAspectClazz == superAspectClass)
             {
                notMyPerVMAspects.put(def, Boolean.TRUE);
             }
@@ -126,9 +129,9 @@
    
    
    
-   private ClassLoaderDomain getAspectRepository(Object aspect)
+   private ClassLoaderDomain getAspectRepository(Class clazz)
    {
-      ClassLoader cl = aspect.getClass().getClassLoader();
+      ClassLoader cl = clazz.getClassLoader();
       ClassLoaderDomain domain = registry.getClassLoaderDomainForLoader(cl);
       return domain;
    }