[jboss-cvs] JBossAS SVN: r87687 - in projects/aop/trunk: asintegration-mc and 1 other directories.

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

Author: kabir.khan at jboss.com
Date: 2009-04-22 15:41:43 -0400 (Wed, 22 Apr 2009)
New Revision: 87687

Modified:
   projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java
   projects/aop/trunk/aop/src/main/java/org/jboss/aop/GeneratedAdvisorDomain.java
   projects/aop/trunk/asintegration-mc/.classpath
   projects/aop/trunk/asintegration-mc/pom.xml
   projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/JBossClClassPoolTest.java
Log:
[JBAOP-707] Make unregistering classloaders clean up the advisors better

Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java	2009-04-22 19:39:37 UTC (rev 87686)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/AspectManager.java	2009-04-22 19:41:43 UTC (rev 87687)
@@ -585,6 +585,7 @@
             if (subDomain != null)
             {
                subDomain.cleanAdvisor(clazz);
+               unsubscribeSubDomain(subDomain);
             }
          }
       }
@@ -878,6 +879,7 @@
    public void unregisterClassLoader(ClassLoader cl)
    {
       AOPClassPoolRepository.getInstance().unregisterClassLoader(cl);
+
    }
 
    public ArrayList<String> getExclude()
@@ -2300,7 +2302,11 @@
    {
       synchronized (subscribedSubDomains)
       {
-         subscribedSubDomains.remove(domain);
+         if (subscribedSubDomains.remove(domain) == null)
+         {
+            subscribedSubDomainsQueue.remove(domain);
+         }
+         
       }
    }
 

Modified: projects/aop/trunk/aop/src/main/java/org/jboss/aop/GeneratedAdvisorDomain.java
===================================================================
--- projects/aop/trunk/aop/src/main/java/org/jboss/aop/GeneratedAdvisorDomain.java	2009-04-22 19:39:37 UTC (rev 87686)
+++ projects/aop/trunk/aop/src/main/java/org/jboss/aop/GeneratedAdvisorDomain.java	2009-04-22 19:41:43 UTC (rev 87687)
@@ -27,7 +27,7 @@
  */
 public class GeneratedAdvisorDomain extends Domain
 {
-
+   
    public GeneratedAdvisorDomain(AspectManager manager, String name, Class<?> clazz)
    {
       this(manager, name, clazz, false);

Modified: projects/aop/trunk/asintegration-mc/.classpath
===================================================================
--- projects/aop/trunk/asintegration-mc/.classpath	2009-04-22 19:39:37 UTC (rev 87686)
+++ projects/aop/trunk/asintegration-mc/.classpath	2009-04-22 19:41:43 UTC (rev 87687)
@@ -2,8 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
-	<!--classpathentry excluding="org/jboss/test/aop/classpool/jbosscl/support/excluded/|org/jboss/test/aop/classpool/jbosscl/weaving/support/excluded/" kind="src" output="target/test-classes" path="src/test/java"/-->
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry excluding="org/jboss/test/aop/classpool/jbosscl/support/excluded/|org/jboss/test/aop/classpool/jbosscl/weaving/support/excluded/" kind="src" output="target/test-classes" path="src/test/java"/>
+	<!--classpathentry kind="src" output="target/test-classes" path="src/test/java"/-->
 	<classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1.1/activation-1.1.1.jar"/>

Modified: projects/aop/trunk/asintegration-mc/pom.xml
===================================================================
--- projects/aop/trunk/asintegration-mc/pom.xml	2009-04-22 19:39:37 UTC (rev 87686)
+++ projects/aop/trunk/asintegration-mc/pom.xml	2009-04-22 19:41:43 UTC (rev 87687)
@@ -53,8 +53,6 @@
           </includes>
           <excludes>
             <exclude>org/jboss/test/aop/integration/complex/test/ComplexImportMultipleVersionsUnitTestCase.class</exclude>
-            <exclude>org/jboss/test/aop/classpool/jbosscl/weaving/test/ClassicWeavingTestCase.class</exclude>
-            <exclude>org/jboss/test/aop/classpool/jbosscl/weaving/test/GeneratedAdvisorWeavingTestCase.class</exclude>
           </excludes>
           <systemProperties>
             <property>

Modified: projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/JBossClClassPoolTest.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/JBossClClassPoolTest.java	2009-04-22 19:39:37 UTC (rev 87686)
+++ projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/JBossClClassPoolTest.java	2009-04-22 19:41:43 UTC (rev 87687)
@@ -191,8 +191,8 @@
    protected void setUp() throws Exception
    {
       super.setUp();
-//      enableTrace("org.jboss.aop.classpool");
-//      enableTrace("org.jboss.aop.classpool.jbosscl");
+      //enableTrace("org.jboss.aop.classpool");
+      //enableTrace("org.jboss.aop.classpool.jbosscl");
       deploy("/org/jboss/test/aop/classpool/jbosscl/Common.xml");
    }