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

fixed type assignability check for wildcarded Map (SPR-6676)

Browse Source
This commit is contained in:
Juergen Hoeller
2010-01-12 15:31:30 +00:00
parent 1ff99f2569
commit 7cbd9e1d93
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2009 the original author or authors.
* Copyright 2002-2010 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -456,7 +456,7 @@ public class TypeDescriptor {
private boolean isTypeAssignableTo(Class<?> clazz) {
Class<?> type = getType();
return (type != null && ClassUtils.isAssignable(clazz, type));
return (type != null && (clazz == null || ClassUtils.isAssignable(clazz, type)));
}