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

turned TypeDescriptor.UNKNOWN into an internal detail (SPR-7349)

Browse Source
This commit is contained in:
Juergen Hoeller
2010-07-26 20:55:14 +00:00
parent 3c0ce48cbd
commit d4f73c1d3d
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.core/src/main/java/org/springframework/core/convert/TypeDescriptor.java
View File

@@ -43,7 +43,7 @@ public class TypeDescriptor {
public static final TypeDescriptor NULL = new TypeDescriptor(); public static final TypeDescriptor NULL = new TypeDescriptor();
/** Constant defining a TypeDescriptor for 'unknown type' */ /** Constant defining a TypeDescriptor for 'unknown type' */
public static final TypeDescriptor UNKNOWN = new TypeDescriptor(Object.class); private static final TypeDescriptor UNKNOWN = new TypeDescriptor(Object.class);
private static final Map<Class<?>, TypeDescriptor> typeDescriptorCache = new HashMap<Class<?>, TypeDescriptor>(); private static final Map<Class<?>, TypeDescriptor> typeDescriptorCache = new HashMap<Class<?>, TypeDescriptor>();

6
org.springframework.core/src/main/java/org/springframework/core/convert/support/PropertyTypeDescriptor.java
View File

@@ -118,11 +118,11 @@ public class PropertyTypeDescriptor extends TypeDescriptor {
} }
public TypeDescriptor forElementType(Class<?> elementType) { public TypeDescriptor forElementType(Class<?> elementType) {
if (elementType == null) { if (elementType != null) {
return TypeDescriptor.UNKNOWN; return new PropertyTypeDescriptor(this.propertyDescriptor, getMethodParameter(), elementType);
} }
else { else {
return new PropertyTypeDescriptor(this.propertyDescriptor, getMethodParameter(), elementType); return super.forElementType(null);
} }
} }