[jboss-cvs] JBossAS SVN: r83944 - in branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop: standalone and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2009-02-06 06:26:39 -0500 (Fri, 06 Feb 2009)
New Revision: 83944

Modified:
   branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/AspectManager.java
   branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/standalone/Package.java
Log:
[JBAOP-700] getTopLevelClassLoader() was always using TCL. Package.aopClassMap() should use top-level AspectManager

Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/AspectManager.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/AspectManager.java	2009-02-06 11:00:04 UTC (rev 83943)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/AspectManager.java	2009-02-06 11:26:39 UTC (rev 83944)
@@ -240,7 +240,7 @@
 
    public static synchronized AspectManager getTopLevelAspectManager()
    {
-      if (scopedCLHelper != null)
+      if (scopedCLHelper == null)
       {
          //We are not running in jboss
          return instance();

Modified: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/standalone/Package.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/standalone/Package.java	2009-02-06 11:00:04 UTC (rev 83943)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/standalone/Package.java	2009-02-06 11:26:39 UTC (rev 83944)
@@ -21,14 +21,14 @@
   */
 package org.jboss.aop.standalone;
 
-import org.jboss.aop.Advisor;
-import org.jboss.aop.AspectManager;
-
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.StringTokenizer;
 
+import org.jboss.aop.Advisor;
+import org.jboss.aop.AspectManager;
+
 /**
  * Comment
  *
@@ -73,7 +73,12 @@
 
    public static Package aopClassMap()
    {
-      Map advisors = AspectManager.instance().getAdvisors();
+      return aopClassMap(AspectManager.getTopLevelAspectManager());
+   }
+   
+   public static Package aopClassMap(AspectManager manager)
+   {
+      Map advisors = manager.getAdvisors();
       Iterator it = advisors.keySet().iterator();
       Package root = new Package("classes");
       while (it.hasNext())