]> source.dussan.org Git - aspectj.git/commitdiff
323634: only parameterize if there is something to parameterize
authoraclement <aclement>
Wed, 25 Aug 2010 16:41:33 +0000 (16:41 +0000)
committeraclement <aclement>
Wed, 25 Aug 2010 16:41:33 +0000 (16:41 +0000)
org.aspectj.matcher/src/org/aspectj/weaver/ReferenceType.java

index 17d3ca3ec3b3ad69317a3fe4eb805d2ab249dcd3..eb4bff25540487eb69caad6f31a77e93918b57af 100644 (file)
@@ -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);
                }