missing perTypeWithinEntry filtering - happens when running @AtAJSyntax suite in LTW

diff --git a/weaver/src/org/aspectj/weaver/Shadow.java b/weaver/src/org/aspectj/weaver/Shadow.java
index 5124e69c48adfdc04f12869e6f422aa171a136dc..93c49f0f0211afb9496bcf80b5432457ddab7c78 100644 (file)
--- a/weaver/src/org/aspectj/weaver/Shadow.java
+++ b/weaver/src/org/aspectj/weaver/Shadow.java
@@ -447,7 +447,7 @@ public abstract class Shadow {
 
        public IRelationship.Kind determineRelKind(ShadowMunger munger) {
                AdviceKind ak = ((Advice)munger).getKind();
-               if (ak.getKey()==AdviceKind.Before.getKey()) 
+               if (ak.getKey()==AdviceKind.Before.getKey())
                                return IRelationship.Kind.ADVICE_BEFORE;
                else if (ak.getKey()==AdviceKind.After.getKey())
                                return IRelationship.Kind.ADVICE_AFTER;
@@ -464,8 +464,9 @@ public abstract class Shadow {
                ak.getKey()==AdviceKind.PerCflowBelowEntry.getKey() ||
                ak.getKey()==AdviceKind.PerThisEntry.getKey() ||
                ak.getKey()==AdviceKind.PerTargetEntry.getKey() ||
-               ak.getKey()==AdviceKind.Softener.getKey()) {
-        //FIXME: Alex: why this System.err was there ?? It prints nasty thing in my LTW. 
+               ak.getKey()==AdviceKind.Softener.getKey() ||
+        ak.getKey()==AdviceKind.PerTypeWithinEntry.getKey()) {
+        //FIXME: Alex: why this System.err was there ?? It prints nasty thing in my LTW.
           System.err.println("Dont want a message about this: "+ak);
                          return null;
                }