From 19c3e16d2212bdd41144da2150c8ef46b4a759a5 Mon Sep 17 00:00:00 2001
From: jhugunin <jhugunin>
Date: Thu, 13 Feb 2003 22:24:56 +0000
Subject: [PATCH] fixed Bug 31423: adviceexecution not working

---
 tests/ajcTests.xml                            |  6 ++++
 tests/bugs/AdviceExec.java                    | 31 +++++++++++++++++++
 .../weaver/patterns/KindedPointcut.java       |  2 --
 .../weaver/patterns/SignaturePattern.java     |  2 ++
 4 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 tests/bugs/AdviceExec.java

diff --git a/tests/ajcTests.xml b/tests/ajcTests.xml
index 15864594a..ab1a6fe0d 100644
--- a/tests/ajcTests.xml
+++ b/tests/ajcTests.xml
@@ -5573,4 +5573,10 @@
         <run class="test.Test3"/>
     </ajc-test>
 
+    <ajc-test dir="bugs" pr="31423" 
+    		title="Pointcut adviceexecution() does not work">
+        <compile files="AdviceExec.java"/>
+        <run class="AdviceExec"/>
+    </ajc-test>
+
 </suite>
diff --git a/tests/bugs/AdviceExec.java b/tests/bugs/AdviceExec.java
new file mode 100644
index 000000000..7d28f28fe
--- /dev/null
+++ b/tests/bugs/AdviceExec.java
@@ -0,0 +1,31 @@
+// for Bug#:  31423  
+import org.aspectj.testing.Tester;
+
+
+public class AdviceExec {
+    public static void main(String[] args) {
+    	Tester.checkEqual(Aspect1.ran, 2, "Aspect1 ran");
+    	Tester.checkEqual(Aspect2.ran, 2, "Aspect2 ran");
+    }
+}
+
+aspect Aspect1 {
+	static int ran = 0;
+    before() : execution(* AdviceExec.*(..)) {
+		//System.out.println("Reached " + thisJoinPoint);
+		ran++;
+    }
+    
+    void around(): execution(* AdviceExec.*(..)) {
+    	ran++;
+    	proceed();
+    }
+}
+
+aspect Aspect2 {
+	static int ran = 0;
+    before() : adviceexecution() && !within(Aspect2) {
+		//System.out.println("Reached " + thisJoinPoint);
+		ran++;
+    }
+}
diff --git a/weaver/src/org/aspectj/weaver/patterns/KindedPointcut.java b/weaver/src/org/aspectj/weaver/patterns/KindedPointcut.java
index 207f58259..6003e8f74 100644
--- a/weaver/src/org/aspectj/weaver/patterns/KindedPointcut.java
+++ b/weaver/src/org/aspectj/weaver/patterns/KindedPointcut.java
@@ -35,8 +35,6 @@ public class KindedPointcut extends Pointcut {
 	public boolean fastMatch(JavaClass jc) { return true; }
 	
 	public FuzzyBoolean match(Shadow shadow) {
-		
-		
 		if (shadow.getKind() != kind) return FuzzyBoolean.NO;
 		
 		if (!signature.matches(shadow.getSignature(), shadow.getIWorld())) return  FuzzyBoolean.NO;
diff --git a/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java b/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java
index fe6f656c7..f6b091289 100644
--- a/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java
+++ b/weaver/src/org/aspectj/weaver/patterns/SignaturePattern.java
@@ -85,6 +85,8 @@ public class SignaturePattern extends PatternNode {
 			world.getLint().unresolvableMember.signal(member.toString(), getSourceLocation());
 			return false;
 		}
+		if (kind == Member.ADVICE) return true;
+		
 		if (!modifiers.matches(sig.getModifiers())) return false;
 		
 		if (kind == Member.STATIC_INITIALIZATION) {
-- 
2.39.5