273628: test and fix: use of if() pointcut in annotation style with annotation value...

diff --git a/weaver/src/org/aspectj/weaver/bcel/AnnotationAccessFieldVar.java b/weaver/src/org/aspectj/weaver/bcel/AnnotationAccessFieldVar.java
index af73d4497e7b255dd8829a91b53860d2c67b945f..10644c35c17c1f1a2100ffeb4d93f96f3b144abb 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/AnnotationAccessFieldVar.java
+++ b/weaver/src/org/aspectj/weaver/bcel/AnnotationAccessFieldVar.java
@@ -91,6 +91,15 @@ class AnnotationAccessFieldVar extends BcelVar {
                }
        }
 
+       public void insertLoad(InstructionList il, InstructionFactory fact) {
+               // Only possible to do annotation field value extraction at
+               // MethodExecution
+               if (annoAccessor.getKind() != Shadow.MethodExecution) {
+                       return;
+               }
+               appendLoadAndConvert(il, fact, annoFieldOfInterest);
+       }
+
        public String toString() {
                return super.toString();
        }