162135: test and fix

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/IfPointcut.java b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/IfPointcut.java
index eaa2e1f61d8526f0e97a42738a80158d4bb9f258..e8e9b05befdd213b95c3ac269a1f81eb3b144064 100644 (file)
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/IfPointcut.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/patterns/IfPointcut.java
@@ -229,7 +229,12 @@ public class IfPointcut extends Pointcut {
                                        } else {
                                                // we don't use i as JoinPoint.* can be anywhere in the signature in @style
                                                Var v = state.get(currentStateIndex++);
+
+                                               while (v == null && currentStateIndex < state.size()) { // pr162135
+                                                       v = state.get(currentStateIndex++);
+                                               }
                                                args.add(v);
+
                                                ret = Test.makeAnd(ret, Test.makeInstanceof(v, testMethod.getParameterTypes()[i]
                                                                .resolve(shadow.getIWorld())));
                                        }