From 11645343f9083c8f0b6d7ed73b3124ba857d0051 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Mon, 19 Jun 2006 15:34:25 +0000
Subject: [PATCH] fixed decp bug and problem with 1.5 IBM VM

---
 tests/java5/ataspectj/ataspectj/hierarchy/aop-global.xml | 1 +
 weaver/src/org/aspectj/weaver/bcel/BcelObjectType.java   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

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);
 				}
 			}
-- 
2.39.5