[jboss-cvs] JBossAS SVN: r86992 - projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop.

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

Author: kabir.khan at jboss.com
Date: 2009-04-08 16:19:11 -0400 (Wed, 08 Apr 2009)
New Revision: 86992

Modified:
   projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/AspectManager.java
Log:
[JBAOP-715] Fix AspectManager.getAdvisors()

Modified: projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/AspectManager.java
===================================================================
--- projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/AspectManager.java	2009-04-08 20:17:37 UTC (rev 86991)
+++ projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/AspectManager.java	2009-04-08 20:19:11 UTC (rev 86992)
@@ -524,20 +524,19 @@
    public Map<Class<?>, WeakReference<Advisor>> getAdvisors()
    {
       WeakHashMap<Class<?>, WeakReference<Advisor>> tmpAdvisors = new WeakHashMap<Class<?>, WeakReference<Advisor>>(advisors);
-      if(getSubDomainsPerClass().size() > 0)
+      Map<Class<?>, WeakReference<Domain>> domainsMap = getSubDomainsPerClass();
+      if(domainsMap.size() > 0)
       {
-         Map<Class<?>, WeakReference<Domain>> domainsMap = getSubDomainsPerClass();
          Set<Class<?>> keys = domainsMap.keySet();
-         Domain subDomain = null;
          for(Class<?> clazz : keys)
          {
-            WeakReference<Domain> ref = getSubDomainsPerClass().get(clazz);
+            WeakReference<Domain> ref = domainsMap.get(clazz);
             if (ref != null)
             {
-               subDomain = ref.get();
+               Domain subDomain = ref.get();
                if(subDomain != null)
                {
-                  WeakReference<Advisor> advisorRef = advisors.get(clazz);
+                  WeakReference<Advisor> advisorRef = subDomain.advisors.get(clazz);
                   tmpAdvisors.put(clazz, advisorRef);
                }
             }