fix for Bugzilla Bug 29689

   Declare precedence should not allow multiple * patterns

diff --git a/weaver/src/org/aspectj/weaver/patterns/DeclarePrecedence.java b/weaver/src/org/aspectj/weaver/patterns/DeclarePrecedence.java
index 837bbc7ce04a7c2a7c00dd693aa14b0e784f94cc..cf0ff8d1a43f2086e3975ea345179f510ea94005 100644 (file)
--- a/weaver/src/org/aspectj/weaver/patterns/DeclarePrecedence.java
+++ b/weaver/src/org/aspectj/weaver/patterns/DeclarePrecedence.java
@@ -65,10 +65,19 @@ public class DeclarePrecedence extends Declare {
        
     public void resolve(IScope scope) {
        patterns = patterns.resolveBindings(scope, Bindings.NONE, false, false); 
+       boolean seenStar = false;
        
        for (int i=0; i < patterns.size(); i++) {
                TypePattern pi = patterns.get(i);
-               if (pi.isStar()) continue;
+               if (pi.isStar()) {
+                       if (seenStar) {
+                               scope.getWorld().showMessage(IMessage.ERROR,
+                                       "circularity in declare dominates, '*' occurs more than once",
+                                       pi.getSourceLocation(), null);                                  
+                       }
+                       seenStar = true;
+                       continue;
+               }
                ResolvedTypeX exactType = pi.getExactType().resolve(scope.getWorld());
                if (exactType == ResolvedTypeX.MISSING) continue;
                for (int j=0; j < patterns.size(); j++) {