From: aclement <aclement>
Date: Wed, 1 Mar 2006 08:22:08 +0000 (+0000)
Subject: fix for 129566
X-Git-Tag: POST_MEMORY_CHANGES~16
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0748a02f3e581dcff1c70f3f82e935871d2a36a9;p=aspectj.git

fix for 129566
---

diff --git a/weaver/src/org/aspectj/weaver/ReferenceType.java b/weaver/src/org/aspectj/weaver/ReferenceType.java
index 9c6b529c7..dab54d1ab 100644
--- 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];
 			}