From 2ae4f531c7f7c3c38c983c73492ef63b224784e3 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Mon, 12 Sep 2005 13:37:56 +0000
Subject: Test and fix for PR103740: Compiler failure on @annotation

---
 weaver/src/org/aspectj/weaver/patterns/AnnotationPointcut.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'weaver')

diff --git a/weaver/src/org/aspectj/weaver/patterns/AnnotationPointcut.java b/weaver/src/org/aspectj/weaver/patterns/AnnotationPointcut.java
index 3a6dcfcf0..6dd2f65df 100644
--- a/weaver/src/org/aspectj/weaver/patterns/AnnotationPointcut.java
+++ b/weaver/src/org/aspectj/weaver/patterns/AnnotationPointcut.java
@@ -185,9 +185,6 @@ public class AnnotationPointcut extends NameBindingPointcut {
 	 * @see org.aspectj.weaver.patterns.Pointcut#findResidue(org.aspectj.weaver.Shadow, org.aspectj.weaver.patterns.ExposedState)
 	 */
 	protected Test findResidueInternal(Shadow shadow, ExposedState state) {
-
-
-
 		
 		if (annotationTypePattern instanceof BindingAnnotationTypePattern) {
 			BindingAnnotationTypePattern btp = (BindingAnnotationTypePattern)annotationTypePattern;
@@ -212,8 +209,11 @@ public class AnnotationPointcut extends NameBindingPointcut {
 				state.setErroneousVar(btp.getFormalIndex());
 			}
 			state.set(btp.getFormalIndex(),var);
-		} 
-		return Literal.TRUE;
+		}
+		if (matchInternal(shadow).alwaysTrue()) 
+			return Literal.TRUE;
+		else 
+			return Literal.FALSE;
 	}
 
 	/* (non-Javadoc)
-- 
cgit v1.2.3