String methodGenericSig = mi.getGenericSignature();
for(int j = 0; j < parameterizedTypes.length; j++) {
if (Types.isTypeParameter(parameterizedTypes[j], methodGenericSig) ||
- Types.isTypeParameter(parameterizedTypes[j], classGenericSig)) {
+ Types.isTypeParameter(parameterizedTypes[j], classGenericSig)) {
types[j] = getTypeVariableImplObject(env, objRef, parameterizedTypes[j]);
} else if (Types.isWildcardType(parameterizedTypes[j])) {
- types[j] = getWildcardTypeImplObject(env, objRef, parameterizedTypes[j]);
+ types[j] = getWildcardTypeImplObject(env, objRef, parameterizedTypes[j], mi);
} else if (Types.isParameterizedType(parameterizedTypes[j])) {
// Recursion!
types[j] = getParameterizedTypeImplObj(parameterizedTypes[j], env, objRef, mi);
return paramTypeRef;
}
- private static int getWildcardTypeImplObject(MJIEnv env, int objRef, String wildcardType) {
+ private static int getWildcardTypeImplObject(MJIEnv env, int objRef, String wildcardType, MethodInfo mi) {
ThreadInfo ti = env.getThreadInfo();
ClassLoaderInfo cli = env.getSystemClassLoaderInfo();
ClassInfo ci = cli.getResolvedClassInfo("sun.reflect.generics.reflectiveObjects.WildcardTypeImpl");
int wildcardRef = env.newObject(ci);
ElementInfo ei = env.getModifiableElementInfo(wildcardRef);
- String actualType = Types.getWildcardType(wildcardType);
- ClassInfo uci = cli.getResolvedClassInfo(actualType);
- if (!uci.isRegistered()) {
- uci.registerClass(ti);
- }
+ // Type parameter test
+ // TODO: This test could probably be made cleaner
+ String classGenericSig = mi.getClassInfo().getGenericSignature();
+ String methodGenericSig = mi.getGenericSignature();
+ String typeParameter = Types.getTypeParameter(wildcardType);
int uRef = MJIEnv.NULL;
int lRef = MJIEnv.NULL;
- if (wildcardType.startsWith("+L") || wildcardType.equals("*")) {
- // Set upperBounds
- uRef = env.newObjectArray("Ljava/lang/reflect/Type;", 1);
- env.setReferenceArrayElement(uRef, 0, uci.getClassObjectRef());
- lRef = env.newObjectArray("Ljava/lang/reflect/Type;", 0);
- } else { // wildcardType.startsWith("-L")
- // Set lowerBounds
- lRef = env.newObjectArray("Ljava/lang/reflect/Type;", 1);
- env.setReferenceArrayElement(lRef, 0, uci.getClassObjectRef());
+ if (Types.isTypeParameter(typeParameter, methodGenericSig) ||
+ Types.isTypeParameter(typeParameter, classGenericSig)) {
+ int tpRef = getTypeVariableImplObject(env, objRef, typeParameter);
+ if (wildcardType.startsWith("+")) {
+ // Set upperBounds
+ uRef = env.newObjectArray("Ljava/lang/reflect/Type;", 1);
+ env.setReferenceArrayElement(uRef, 0, tpRef);
+ lRef = env.newObjectArray("Ljava/lang/reflect/Type;", 0);
+ } else { // wildcardType.startsWith("-")
+ // Set lowerBounds
+ lRef = env.newObjectArray("Ljava/lang/reflect/Type;", 1);
+ env.setReferenceArrayElement(lRef, 0, tpRef);
+ }
+ } else {
+
+ String actualType = Types.getWildcardType(wildcardType);
+ ClassInfo uci = cli.getResolvedClassInfo(actualType);
+ if (!uci.isRegistered()) {
+ uci.registerClass(ti);
+ }
+ if (wildcardType.startsWith("+L") || wildcardType.equals("*")) {
+ // Set upperBounds
+ uRef = env.newObjectArray("Ljava/lang/reflect/Type;", 1);
+ env.setReferenceArrayElement(uRef, 0, uci.getClassObjectRef());
+ lRef = env.newObjectArray("Ljava/lang/reflect/Type;", 0);
+ } else { // wildcardType.startsWith("-L")
+ // Set lowerBounds
+ lRef = env.newObjectArray("Ljava/lang/reflect/Type;", 1);
+ env.setReferenceArrayElement(lRef, 0, uci.getClassObjectRef());
+ }
}
ei.setReferenceField("upperBounds", uRef);
ei.setReferenceField("lowerBounds", lRef);