fix for 129566

diff --git a/weaver/src/org/aspectj/weaver/ReferenceType.java b/weaver/src/org/aspectj/weaver/ReferenceType.java
index 9c6b529c798d7102734ee3558989623d47ed87e5..dab54d1ab87d04ff9edd3d6364d0a91d579a6e78 100644 (file)
--- a/weaver/src/org/aspectj/weaver/ReferenceType.java
+++ b/weaver/src/org/aspectj/weaver/ReferenceType.java
@@ -470,7 +470,12 @@ public class ReferenceType extends ResolvedType {
                                TypeVariableReference tvrt = (TypeVariableReference)tParm;
                                TypeVariable tv = tvrt.getTypeVariable();
                                int rank = getRank(tv.getName());
-                               retVal[i]= paramTypes[rank];
+                               // -1 probably means it is a reference to a type variable on the outer generic type (see pr129566)
+                               if (rank!=-1) {
+                                       retVal[i] = paramTypes[rank];
+                               } else {
+                                       retVal[i] = tParms[i];
+                               }
                        } else {
                                retVal[i] = tParms[i];
                        }