From: aclement <aclement>
Date: Fri, 4 Sep 2009 20:51:55 +0000 (+0000)
Subject: 286375: test and fix: recursive decl npe
X-Git-Tag: V1_6_6~86
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9eb61273fe9f7e1ebe4e4ef3bde4ed5bfd42886d;p=aspectj.git

286375: test and fix: recursive decl npe
---

diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedType.java b/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedType.java
index f1f677955..bad61e2bd 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedType.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedType.java
@@ -80,6 +80,10 @@ public abstract class ResolvedType extends UnresolvedType implements AnnotatedEl
 
 	public abstract ResolvedMember[] getDeclaredPointcuts();
 
+	public boolean isCacheable() {
+		return true;
+	}
+
 	/**
 	 * Returns a ResolvedType object representing the superclass of this type, or null. If this represents a java.lang.Object, a
 	 * primitive type, or void, this method returns null.
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/World.java b/org.aspectj.matcher/src/org/aspectj/weaver/World.java
index 92666c15e..f8fd2a310 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/World.java
+++ b/org.aspectj.matcher/src/org/aspectj/weaver/World.java
@@ -946,6 +946,9 @@ public abstract class World implements Dump.INode {
 		 * generic type.
 		 */
 		public ResolvedType put(String key, ResolvedType type) {
+			if (!type.isCacheable()) {
+				return type;
+			}
 			if (type.isParameterizedType() && type.isParameterizedWithTypeVariable()) {
 				if (debug)
 					System.err