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

properly support void.class in TypeDescriptor and GenericConversionService (SPR-7281)

Browse Source
This commit is contained in:
Juergen Hoeller
2010-06-11 21:40:56 +00:00
parent cbb90236dc
commit 379bc5a8a6
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
org.springframework.core/src/main/java/org/springframework/util/ClassUtils.java
View File

@@ -794,7 +794,7 @@ public abstract class ClassUtils {
*/
public static Class<?> resolvePrimitiveIfNecessary(Class<?> clazz) {
Assert.notNull(clazz, "Class must not be null");
return (clazz.isPrimitive() ? primitiveTypeToWrapperMap.get(clazz) : clazz);
return (clazz.isPrimitive() && clazz != void.class? primitiveTypeToWrapperMap.get(clazz) : clazz);
}
/**
@@ -802,7 +802,7 @@ public abstract class ClassUtils {
* type, assuming setting by reflection. Considers primitive wrapper
* classes as assignable to the corresponding primitive types.
* @param lhsType the target type
* @param rhsType the value type that should be assigned to the target type
* @param rhsType the value type that should be assigned to the target type
* @return if the target type is assignable from the value type
* @see TypeUtils#isAssignable
*/