Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2011-10-11 01:00:31 +00:00
parent 37c601c8dd
commit 339c57e41a
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
org.springframework.core/src/main/java/org/springframework/core/GenericTypeResolver.java
View File

@@ -116,21 +116,20 @@ public abstract class GenericTypeResolver {
public static Class<?> resolveReturnTypeArgument(Method method, Class<?> genericIfc) {
Type returnType = method.getReturnType();
Type genericReturnType = method.getGenericReturnType();
ParameterizedType targetType;
if (returnType.equals(genericIfc)) {
if (genericReturnType instanceof ParameterizedType) {
targetType = (ParameterizedType)genericReturnType;
ParameterizedType targetType = (ParameterizedType) genericReturnType;
Type[] actualTypeArguments = targetType.getActualTypeArguments();
Type typeArg = actualTypeArguments[0];
if (!(typeArg instanceof WildcardType)) {
return (Class<?>)typeArg;
return (Class<?>) typeArg;
}
}
else {
return null;
}
}
return GenericTypeResolver.resolveTypeArgument((Class<?>)returnType, genericIfc);
return GenericTypeResolver.resolveTypeArgument((Class<?>) returnType, genericIfc);
}
/**