239441 - testcode and fix

diff --git a/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java b/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java
index 0597116403c4bf5c4d364c46b14829c440dd2253..831457cb25ecf2a28aef8e2b0d2e7d1f7ae92154 100644 (file)
--- a/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java
+++ b/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java
@@ -344,9 +344,13 @@ public class SignaturePattern extends PatternNode {
                }
                if (matchesIgnoringAnnotations.alwaysFalse()) return FuzzyBoolean.NO;
                
+               // why did Adrian put this comment in:
                // annotations match on the *subject* 
-               if (subjectMatch && !matchesAnnotations(aMember,inAWorld).alwaysTrue()) {
-                       return FuzzyBoolean.NO;
+               // surely you never want execution(@Something * *(..)) to match something just because
+               // it is a secondary join point signature for a join point and doesn't have the annotation?
+               // pr239441
+               if (matchesIgnoringAnnotations.alwaysTrue()) {
+                       return matchesAnnotations(aMember,inAWorld);
                } else {
                        return matchesIgnoringAnnotations;
                }