[jboss-cvs] JBossAS SVN: r58062 - in projects/aop/trunk/aop/src: main/org/jboss/aop/advice resources/test/construction

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

Author: kabir.khan at jboss.com
Date: 2006-11-03 05:29:33 -0500 (Fri, 03 Nov 2006)
New Revision: 58062

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AbstractAdvice.java
   projects/aop/trunk/aop/src/resources/test/construction/jboss-aop.xml
Log:
[JBAOP-303] Per instance construction advices should be possible, include chris's fixes and test properly ;-)

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AbstractAdvice.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AbstractAdvice.java	2006-11-03 10:28:52 UTC (rev 58061)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/advice/AbstractAdvice.java	2006-11-03 10:29:33 UTC (rev 58062)
@@ -276,11 +276,11 @@
       }
       if (invocation instanceof ConstructionInvocation)
       {
-         if (constructorAdvice == null)
+         if (constructionAdvice == null)
          {
             throw new IllegalStateException("Unable to resolve ConstructionInvocation advice " + getName());
          }
-         return constructorAdvice;
+         return constructionAdvice;
       }
       if (invocation instanceof MethodCalledByMethodInvocation)
       {

Modified: projects/aop/trunk/aop/src/resources/test/construction/jboss-aop.xml
===================================================================
--- projects/aop/trunk/aop/src/resources/test/construction/jboss-aop.xml	2006-11-03 10:28:52 UTC (rev 58061)
+++ projects/aop/trunk/aop/src/resources/test/construction/jboss-aop.xml	2006-11-03 10:29:33 UTC (rev 58062)
@@ -4,8 +4,8 @@
 <aop>
 
    <aspect class="org.jboss.test.aop.construction.Aspect"/>
-   <aspect class="org.jboss.test.aop.construction.PerInstanceAspect"/>
-   
+   <aspect class="org.jboss.test.aop.construction.PerInstanceAspect" scope="PER_INSTANCE"/>
+
    <bind pointcut="construction(org.jboss.test.aop.construction.SuperPOJO->new(..))">
       <advice aspect="org.jboss.test.aop.construction.Aspect" name="construction"/>
    </bind>
@@ -14,7 +14,7 @@
    <bind pointcut="construction(org.jboss.test.aop.construction.DefaultSuper->new(..))">
       <advice aspect="org.jboss.test.aop.construction.Aspect" name="construction2"/>
    </bind>
-   
+
    <bind pointcut="construction(org.jboss.test.aop.construction.PerInstancePOJO->new(..))">
       <advice aspect="org.jboss.test.aop.construction.PerInstanceAspect" name="construction"/>
       <advice aspect="org.jboss.test.aop.construction.PerInstanceAspect" name="invocation"/>