214559: tests and fix: cope with varying orderings for interdependant declare parents...

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
index b0d2cf61b0bcad32dae48f3e97bd05aa04d1128d..e3a48069c5af507b83abea9de9eb5ff2c82fc155 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelWeaver.java
@@ -1446,8 +1446,8 @@ public class BcelWeaver implements IWeaver {
                        boolean typeChanged = applyDeclareParents(decp,onType);
                        if (typeChanged) {
                                aParentChangeOccurred = true;
-                       } else { // Perhaps it would have matched if a 'dec @type' had modified the type
-                               if (!decp.getChild().isStarAnnotation()) decpToRepeat.add(decp);
+                       } else {
+                               decpToRepeat.add(decp);
                        }
                }