[jboss-cvs] JBossAS SVN: r69465 - projects/aop/trunk/aop/src/main/org/jboss/aop.

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

Author: kabir.khan at jboss.com
Date: 2008-01-29 14:30:07 -0500 (Tue, 29 Jan 2008)
New Revision: 69465

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/InstanceAdvisorDelegate.java
Log:
[JBAOP-518] Fix InstanceAdvisorDelegate.initializeAspects() (take 2)

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/InstanceAdvisorDelegate.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/InstanceAdvisorDelegate.java	2008-01-29 19:27:43 UTC (rev 69464)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/InstanceAdvisorDelegate.java	2008-01-29 19:30:07 UTC (rev 69465)
@@ -99,12 +99,12 @@
          }
       }
       Set defs = getClassAdvisor().getPerInstanceAspectDefinitions();
-      if (aspects == null)
-      {
-         aspects = new WeakHashMap();
-      }
       if (defs.size() > 0)
       {
+         if (aspects == null)
+         {
+            aspects = new WeakHashMap();
+         }
          Iterator it = defs.iterator();
          while (it.hasNext())
          {
@@ -148,10 +148,6 @@
             initJoinpointAspect(def, jpAspects);
          }
       }
-      if (joinpointAspects != null)
-      {
-         joinpointAspects = new WeakHashMap();
-      }
    }
    
    private void initJoinpointAspect(AspectDefinition def, Map jpAspects)
@@ -183,7 +179,10 @@
       if (aspects == null)
       {
          initializeAspects();
-         return aspects.get(def);
+         if (aspects != null)
+         {
+            return aspects.get(def);
+         }
       }
       Object aspect = aspects.get(def);
       if (aspect == null)