From cec4c7798d9d35901d721d3e3cb8aca8db52aa78 Mon Sep 17 00:00:00 2001 From: aclement Date: Thu, 4 Dec 2008 23:39:25 +0000 Subject: [PATCH] 162135: test and fix --- .../src/org/aspectj/weaver/patterns/IfPointcut.java | 5 +++++ 1 file changed, 5 insertions(+) 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()))); } -- 2.39.5