340806

diff --git a/weaver5/java5-src/org/aspectj/weaver/reflect/JavaLangTypeToResolvedTypeConverter.java b/weaver5/java5-src/org/aspectj/weaver/reflect/JavaLangTypeToResolvedTypeConverter.java
index 3d9ede527887fac64ef9140cafe290124e881cb7..8e313dc40213dd9c4a4517632e0049bfe4cb567f 100644 (file)
--- a/weaver5/java5-src/org/aspectj/weaver/reflect/JavaLangTypeToResolvedTypeConverter.java
+++ b/weaver5/java5-src/org/aspectj/weaver/reflect/JavaLangTypeToResolvedTypeConverter.java
@@ -69,26 +69,18 @@ public class JavaLangTypeToResolvedTypeConverter {
                        ResolvedType baseType = fromType(pt.getRawType());
                        Type[] args = pt.getActualTypeArguments();
                        ResolvedType[] resolvedArgs = fromTypes(args);
-/*                     StringBuilder sb = new StringBuilder();
-                       for (int i = 0; i < resolvedArgs.length; i++) {
-                               sb.append(resolvedArgs[i]).append(" ");
-                       }
-                       for (int i = 0; i < resolvedArgs.length; i++) {
-                               if (resolvedArgs[i] == null) {
-                                       String ss = "";
-                                       try {
-                                               ss = aType.toString();
-                                       } catch (Exception e) {
-                                       }
-                                       throw new IllegalStateException("Parameterized type problem.  basetype=" + baseType + " arguments="
-                                                       + sb.toString() + " ss=" + ss);
-                               }
-                       }
-*/
+                       /*
+                        * StringBuilder sb = new StringBuilder(); for (int i = 0; i < resolvedArgs.length; i++) {
+                        * sb.append(resolvedArgs[i]).append(" "); } for (int i = 0; i < resolvedArgs.length; i++) { if (resolvedArgs[i] ==
+                        * null) { String ss = ""; try { ss = aType.toString(); } catch (Exception e) { } throw new
+                        * IllegalStateException("Parameterized type problem.  basetype=" + baseType + " arguments=" + sb.toString() + " ss=" +
+                        * ss); } }
+                        */
                        return TypeFactory.createParameterizedType(baseType, resolvedArgs, getWorld());
                } else if (aType instanceof java.lang.reflect.TypeVariable) {
-                       if (typeVariablesInProgress.get(aType) != null) {
-                               return typeVariablesInProgress.get(aType);
+                       TypeVariableReferenceType inprogressVar = typeVariablesInProgress.get(aType);
+                       if (inprogressVar != null) {
+                               return inprogressVar;
                        }
 
                        java.lang.reflect.TypeVariable tv = (java.lang.reflect.TypeVariable) aType;