From e4b3951948e180dc38c35ce7252aaa3175ffce7e Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Mon, 11 Jul 2005 10:47:08 +0000
Subject: [PATCH] generics: allow for type variables that arrive in static
 methods and don't come from the declaring type

---
 weaver/src/org/aspectj/weaver/ResolvedMember.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/weaver/src/org/aspectj/weaver/ResolvedMember.java b/weaver/src/org/aspectj/weaver/ResolvedMember.java
index 4af534b16..cd0334780 100644
--- a/weaver/src/org/aspectj/weaver/ResolvedMember.java
+++ b/weaver/src/org/aspectj/weaver/ResolvedMember.java
@@ -346,7 +346,7 @@ public class ResolvedMember extends Member implements IHasPosition, AnnotatedEle
 		if (aType instanceof TypeVariableReferenceType) {
 			String variableName = ((TypeVariableReferenceType)aType).getTypeVariable().getName();
 			if (!typeVariableMap.containsKey(variableName)) {
-				throw new IllegalStateException("Type variable " + variableName + " not bound in type map");
+				return aType; // if the type variable comes from the method (and not the type) thats OK
 			}
 			return (TypeX) typeVariableMap.get(variableName);
 		} else {
-- 
2.39.5