From: aclement <aclement>
Date: Thu, 4 Dec 2008 23:39:25 +0000 (+0000)
Subject: 162135: test and fix
X-Git-Tag: V1_6_3rc1~58
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cec4c7798d9d35901d721d3e3cb8aca8db52aa78;p=aspectj.git

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 eaa2e1f61..e8e9b05be 100644
--- 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())));
 					}