Browse Source

allow for null

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@964 50f2f4bb-b051-0410-bef5-90022cba6387
pull/1/head
Andy Clement 17 years ago
parent
commit
10eb34649b
  1. 9
      org.springframework.core/src/main/java/org/springframework/core/convert/TypeDescriptor.java

9
org.springframework.core/src/main/java/org/springframework/core/convert/TypeDescriptor.java

@ -137,7 +137,8 @@ public class TypeDescriptor { @@ -137,7 +137,8 @@ public class TypeDescriptor {
* Is this type an array type?
*/
public boolean isArray() {
return getType().isArray();
Class<?> type = getType();
return (type==null?false:type.isArray());
}
/**
@ -280,7 +281,11 @@ public class TypeDescriptor { @@ -280,7 +281,11 @@ public class TypeDescriptor {
// TODO should properly handle multi dimensional arrays
stringValue.append(getArrayComponentType().getName()).append("[]");
} else {
stringValue.append(getType().getName());
Class<?> clazz = getType();
if (clazz==null) {
return "null";
}
stringValue.append(clazz.getName());
if (isCollection()) {
Class<?> collectionType = getCollectionElementType();
if (collectionType!=null) {

Loading…
Cancel
Save