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 608c489fe751de1e248087fed014d0548bf9bb33..61d1d994ae7c73840e7df767daf71f3ab9a3a6d9 100644 (file)
--- 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 {