diff options
author | aclement <aclement> | 2006-06-19 15:34:25 +0000 |
---|---|---|
committer | aclement <aclement> | 2006-06-19 15:34:25 +0000 |
commit | 11645343f9083c8f0b6d7ed73b3124ba857d0051 (patch) | |
tree | 72c87fefcfcbcb0d1851d6b2d8ce4ddb31ae2e08 | |
parent | 0b27616f8e38fa432f01d07878d2b08ffc25d183 (diff) | |
download | aspectj-11645343f9083c8f0b6d7ed73b3124ba857d0051.tar.gz aspectj-11645343f9083c8f0b6d7ed73b3124ba857d0051.zip |
fixed decp bug and problem with 1.5 IBM VM
-rw-r--r-- | tests/java5/ataspectj/ataspectj/hierarchy/aop-global.xml | 1 | ||||
-rw-r--r-- | weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/java5/ataspectj/ataspectj/hierarchy/aop-global.xml b/tests/java5/ataspectj/ataspectj/hierarchy/aop-global.xml index f17696441..1b0bbed84 100644 --- a/tests/java5/ataspectj/ataspectj/hierarchy/aop-global.xml +++ b/tests/java5/ataspectj/ataspectj/hierarchy/aop-global.xml @@ -2,5 +2,6 @@ <weaver options="-1.5 -XmessageHandlerClass:ataspectj.TestHelper -Xlint:ignore"/> <aspects> <aspect name="ataspectj.hierarchy.AppContainerTest.BaseAspect"/> + <concrete-aspect name="pcalc" precedence="ataspectj.hierarchy.AppContainerTest.BaseAspect,*"/> </aspects> </aspectj>
\ No newline at end of file diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java b/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java index 1257fe25a..10f3b5671 100644 --- a/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java +++ b/weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java @@ -52,6 +52,7 @@ import org.aspectj.weaver.bcel.AtAjAttributes.BindingScope; import org.aspectj.weaver.bcel.BcelGenericSignatureToTypeXConverter.GenericSignatureFormatException; import org.aspectj.weaver.patterns.Declare; import org.aspectj.weaver.patterns.DeclareErrorOrWarning; +import org.aspectj.weaver.patterns.DeclarePrecedence; import org.aspectj.weaver.patterns.FormalBinding; import org.aspectj.weaver.patterns.IScope; import org.aspectj.weaver.patterns.PerClause; @@ -372,7 +373,8 @@ public class BcelObjectType extends AbstractReferenceTypeDelegate { AjAttribute a = (AjAttribute) iter.next(); if (a instanceof AjAttribute.DeclareAttribute) { Declare decl = (((AjAttribute.DeclareAttribute)a).getDeclare()); - if (decl instanceof DeclareErrorOrWarning) { + if (decl instanceof DeclareErrorOrWarning || + decl instanceof DeclarePrecedence) { decl.resolve(bindingScope); } } |