[jboss-cvs] JBossAS SVN: r69449 - 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 12:30:07 -0500 (Tue, 29 Jan 2008)
New Revision: 69449

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

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 15:30:08 UTC (rev 69448)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/InstanceAdvisorDelegate.java	2008-01-29 17:30:07 UTC (rev 69449)
@@ -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,6 +148,10 @@
             initJoinpointAspect(def, jpAspects);
          }
       }
+      if (joinpointAspects != null)
+      {
+         joinpointAspects = new WeakHashMap();
+      }
    }
    
    private void initJoinpointAspect(AspectDefinition def, Map jpAspects)