[jboss-cvs] JBossAS SVN: r58061 - in branches/Branch_AOP_1_5/aop/src: main/org/jboss/aop/advice resources/test/construction
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 3 05:28:55 EST 2006
Author: kabir.khan at jboss.com
Date: 2006-11-03 05:28:52 -0500 (Fri, 03 Nov 2006)
New Revision: 58061
Modified:
branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/advice/AbstractAdvice.java
branches/Branch_AOP_1_5/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: branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/advice/AbstractAdvice.java
===================================================================
--- branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/advice/AbstractAdvice.java 2006-11-03 08:18:22 UTC (rev 58060)
+++ branches/Branch_AOP_1_5/aop/src/main/org/jboss/aop/advice/AbstractAdvice.java 2006-11-03 10:28:52 UTC (rev 58061)
@@ -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: branches/Branch_AOP_1_5/aop/src/resources/test/construction/jboss-aop.xml
===================================================================
--- branches/Branch_AOP_1_5/aop/src/resources/test/construction/jboss-aop.xml 2006-11-03 08:18:22 UTC (rev 58060)
+++ branches/Branch_AOP_1_5/aop/src/resources/test/construction/jboss-aop.xml 2006-11-03 10:28:52 UTC (rev 58061)
@@ -4,7 +4,7 @@
<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"/>
More information about the jboss-cvs-commits
mailing list