View | Details | Raw Unified | Return to bug 115235 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/aspectj/weaver/patterns/Pointcut.java (+2 lines)
Lines 104-109 Link Here
104 
	private FuzzyBoolean lastMatchedShadowResult;
 104 
	private FuzzyBoolean lastMatchedShadowResult;
105 
	private String[] typeVariablesInScope = new String[0];
 105 
	private String[] typeVariablesInScope = new String[0];
106
106
107 
	protected boolean hasBeenParameterized = false;
108
107 
	/**
 109 
	/**
108 
	 * Constructor for Pattern.
 110 
	 * Constructor for Pattern.
109 
	 */
 111 
	 */
(-)src/org/aspectj/weaver/patterns/ReferencePointcut.java (-1 / +4 lines)
Lines 322-328 Link Here
322 
			newBindings.pushEnclosingDefinition(pointcutDec);
 322 
			newBindings.pushEnclosingDefinition(pointcutDec);
323 
			try {
 323 
			try {
324 
				Pointcut ret = pointcutDec.getPointcut();
 324 
				Pointcut ret = pointcutDec.getPointcut();
325 
				if (typeVariableMap != null) ret = ret.parameterizeWith(typeVariableMap);
 325 
				if (typeVariableMap != null && !hasBeenParameterized) {
326 
					ret = ret.parameterizeWith(typeVariableMap);
327 
					ret.hasBeenParameterized=true;
328 
				}
326 
				return ret.concretize(searchStart, declaringType, newBindings);
 329 
				return ret.concretize(searchStart, declaringType, newBindings);
327 
			} finally {
 330 
			} finally {
328 
				newBindings.popEnclosingDefinitition();
 331 
				newBindings.popEnclosingDefinitition();

Return to bug 115235