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

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

diff --git a/weaver/src/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXConverter.java b/weaver/src/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXConverter.java
index 608c489fe..61d1d994a 100644
--- a/weaver/src/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXConverter.java
+++ b/weaver/src/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXConverter.java
@@ -214,8 +214,9 @@ public class BcelGenericSignatureToTypeXConverter {
 	}
 
 	private static void fixUpCircularDependencies(ResolvedType aTypeX, Map typeVariableResolutions) {
-		if (!(aTypeX instanceof ReferenceType))
+		if (!(aTypeX instanceof ReferenceType)) {
 			return;
+		}
 
 		ReferenceType rt = (ReferenceType) aTypeX;
 		TypeVariable[] typeVars = rt.getTypeVariables();
@@ -244,6 +245,10 @@ public class BcelGenericSignatureToTypeXConverter {
 		public ResolvedType resolve(World world) {
 			return this;
 		}
+
+		public boolean isCacheable() {
+			return false;
+		}
 	}
 
 	public static class GenericSignatureFormatException extends Exception {