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

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

Author: kabir.khan at jboss.com
Date: 2008-07-08 09:13:35 -0400 (Tue, 08 Jul 2008)
New Revision: 75496

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/AspectAnnotationLoader.java
Log:
[JBAOP-611] Deploy named pointcuts etc. before deploying binding

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AspectAnnotationLoader.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectAnnotationLoader.java	2008-07-08 12:54:30 UTC (rev 75495)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectAnnotationLoader.java	2008-07-08 13:13:35 UTC (rev 75496)
@@ -80,10 +80,10 @@
       loaderStrategy = new AspectManagerAnnotationLoaderStrategy();
    }
    
-   public AspectAnnotationLoader(AspectManager manager, AspectManagerAnnotationLoaderStrategy loaderStrategy)
+   public AspectAnnotationLoader(AspectManager manager, AspectAnnotationLoaderStrategy loaderStrategy)
    {
       this.manager = manager;
-      this.loaderStrategy = this.loaderStrategy;
+      this.loaderStrategy = loaderStrategy;
    }
 
    public void setClassLoader(ClassLoader cl)
@@ -137,26 +137,12 @@
          if (!deployed)
          {
             deployDynamicCFlow(visible, cf);
-         }
 
-         if (!deployed)
-         {
             if (!deployPreparedClass(visible, cf))
             {
                deployPrecedence(visible, cf);
             }
          }
-         else
-         {
-            deployPointcuts(cf);
-            deployMixins(cf);
-            deployIntroductions(cf);
-            deployTypedefs(cf);
-            deployCFlowStackDefs(cf);
-            deployPrepares(cf);
-            deployAnnotationIntroductions(cf);
-            deployDeclares(cf);
-         }
       }
    }
    
@@ -223,6 +209,9 @@
          }
 
          loaderStrategy.deployAspect(this, isFactory, cf.getName(), scope);
+         
+         deployAspectOrInterceptorFields(cf);
+         
          if (!isFactory)
          {
             deployAspectMethodBindings(cf, cf.getName());
@@ -272,6 +261,8 @@
          }
 
          loaderStrategy.deployInterceptor(this, isFactory, cf.getName(), scope);
+         
+         deployAspectOrInterceptorFields(cf);
 
          deployInterceptorBindings(visible, cf, cf.getName());
 
@@ -1072,4 +1063,16 @@
       buf.append(expr.substring(lastindex));
       return buf.toString();
    }
+   
+   private void deployAspectOrInterceptorFields(ClassFile cf) throws Exception
+   {
+      deployPointcuts(cf);
+      deployMixins(cf);
+      deployIntroductions(cf);
+      deployTypedefs(cf);
+      deployCFlowStackDefs(cf);
+      deployPrepares(cf);
+      deployAnnotationIntroductions(cf);
+      deployDeclares(cf);
+   }
 }