[jboss-cvs] JBossAS SVN: r98003 - in projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src: test/java/org/jboss/test/classpool/jbosscl/test and 1 other directory.

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

Author: flavia.rainone at jboss.com
Date: 2009-12-18 20:16:47 -0500 (Fri, 18 Dec 2009)
New Revision: 98003

Modified:
   projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPClassLoaderInitializer.java
   projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPDomainRegistry.java
   projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPVFSClassLoaderDomainRegistry.java
   projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java
Log:
[JBAOP-742] Duplicate registration of modules on AOPClassLoaderInitializer fixed.

Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPClassLoaderInitializer.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPClassLoaderInitializer.java	2009-12-19 01:15:52 UTC (rev 98002)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPClassLoaderInitializer.java	2009-12-19 01:16:47 UTC (rev 98003)
@@ -80,8 +80,7 @@
             domain = createDomain(registry, unit.getClassLoader(), module, unit);
          }
          
-         registry.initMapsForModule(module, domain);
-
+         registry.setDomain(domain);
          policy.registerClassLoader(module, unit.getClassLoader());
       }
    }

Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPDomainRegistry.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPDomainRegistry.java	2009-12-19 01:15:52 UTC (rev 98002)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPDomainRegistry.java	2009-12-19 01:16:47 UTC (rev 98003)
@@ -26,7 +26,6 @@
 
 import org.jboss.aop.Domain;
 import org.jboss.classloader.spi.ClassLoaderDomain;
-import org.jboss.classloading.spi.dependency.Module;
 import org.jboss.classpool.plugins.jbosscl.DomainRegistry;
 
 /**
@@ -37,7 +36,7 @@
  */
 public interface AOPDomainRegistry extends DomainRegistry
 {
-   boolean initMapsForModule(Module module, ScopedVFSClassLoaderDomain domain);
+   void setDomain(ScopedVFSClassLoaderDomain domain);
    
    Domain getRegisteredDomain(ClassLoader cl);
    

Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPVFSClassLoaderDomainRegistry.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPVFSClassLoaderDomainRegistry.java	2009-12-19 01:15:52 UTC (rev 98002)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/main/java/org/jboss/aop/asintegration/jboss5/AOPVFSClassLoaderDomainRegistry.java	2009-12-19 01:16:47 UTC (rev 98003)
@@ -72,10 +72,10 @@
       return aopDomainsByClassLoader.get(cl);
    }
 
-   public synchronized boolean initMapsForModule(Module module, ScopedVFSClassLoaderDomain domain)
+
+   public synchronized void setDomain(ScopedVFSClassLoaderDomain domain)
    {
       this.initDomain = domain;
-      return super.initMapsForModule(module);
    }
    
    @Override

Modified: projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java
===================================================================
--- projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java	2009-12-19 01:15:52 UTC (rev 98002)
+++ projects/aop/branches/classpool_JBAOP-742/asintegration-mc/src/test/java/org/jboss/test/classpool/jbosscl/test/JBossClClassPoolTest.java	2009-12-19 01:16:47 UTC (rev 98003)
@@ -671,7 +671,8 @@
          setup.setClassLoaderAndDomain(loader, clDomain);
          domain = setup.getDomain();
       }
-      domainRegistry.initMapsForModule(module, domain);
+      domainRegistry.setDomain(domain);
+      domainRegistry.initMapsForModule(module);
    }
    
    protected void unregisterModule(ClassLoader loader)