From: aclement <aclement>
Date: Wed, 25 Aug 2010 16:41:33 +0000 (+0000)
Subject: 323634: only parameterize if there is something to parameterize
X-Git-Tag: V1_6_10RC1~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ce16a06749d562fd123e4ecb984ec3a5a8cf5a94;p=aspectj.git

323634: only parameterize if there is something to parameterize
---

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ReferenceType.java b/org.aspectj.matcher/src/org/aspectj/weaver/ReferenceType.java
index 17d3ca3ec..eb4bff255 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ReferenceType.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/ReferenceType.java
@@ -818,7 +818,7 @@ public class ReferenceType extends ResolvedType {
 	@Override
 	public PerClause getPerClause() {
 		PerClause pclause = getDelegate().getPerClause();
-		if (isParameterizedType()) { // could cache the result here...
+		if (pclause != null && isParameterizedType()) { // could cache the result here...
 			Map<String, UnresolvedType> parameterizationMap = getAjMemberParameterizationMap();
 			pclause = (PerClause) pclause.parameterizeWith(parameterizationMap, world);
 		}