tests and fixes for 115235: stackoverflow on concretizing pointcuts (patch from Helen)

2 files changed, 6 insertions, 1 deletions

diff --git a/weaver/src/org/aspectj/weaver/patterns/Pointcut.java b/weaver/src/org/aspectj/weaver/patterns/Pointcut.java
index 64029dd29..1cf99da28 100644
--- a/weaver/src/org/aspectj/weaver/patterns/Pointcut.java
+++ b/weaver/src/org/aspectj/weaver/patterns/Pointcut.java
@@ -104,6 +104,8 @@ public abstract class Pointcut extends PatternNode {
 	private FuzzyBoolean lastMatchedShadowResult;
 	private String[] typeVariablesInScope = new String[0];
 	
+	protected boolean hasBeenParameterized = false;
+	
 	/**
 	 * Constructor for Pattern.
 	 */
diff --git a/weaver/src/org/aspectj/weaver/patterns/ReferencePointcut.java b/weaver/src/org/aspectj/weaver/patterns/ReferencePointcut.java
index 886e5f818..6d99ae261 100644
--- a/weaver/src/org/aspectj/weaver/patterns/ReferencePointcut.java
+++ b/weaver/src/org/aspectj/weaver/patterns/ReferencePointcut.java
@@ -322,7 +322,10 @@ public class ReferencePointcut extends Pointcut {
 			newBindings.pushEnclosingDefinition(pointcutDec);
 			try {
 				Pointcut ret = pointcutDec.getPointcut();
-				if (typeVariableMap != null) ret = ret.parameterizeWith(typeVariableMap);
+				if (typeVariableMap != null && !hasBeenParameterized) {					
+					ret = ret.parameterizeWith(typeVariableMap);
+					ret.hasBeenParameterized=true;
+				}
 				return ret.concretize(searchStart, declaringType, newBindings);
 			} finally {
 				newBindings.popEnclosingDefinitition();