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

TypeVariablesVariableResolver compares variables by full equality again

Browse Source 
Issue: SPR-16456
This commit is contained in:
Juergen Hoeller
2018-02-02 12:41:43 +01:00
parent 30f6e447d5
commit c5a33d62dd
4 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-core/src/main/java/org/springframework/core/ResolvableType.java
View File

@@ -1468,7 +1468,9 @@ public class ResolvableType implements Serializable {
@Nullable
public ResolvableType resolveVariable(TypeVariable<?> variable) {
for (int i = 0; i < this.variables.length; i++) {
if (ObjectUtils.nullSafeEquals(this.variables[i].getName(), variable.getName())) {
TypeVariable<?> v1 = SerializableTypeWrapper.unwrap(this.variables[i]);
TypeVariable<?> v2 = SerializableTypeWrapper.unwrap(variable);
if (ObjectUtils.nullSafeEquals(v1, v2)) {
return this.generics[i];
}
}

2
spring-core/src/test/java/org/springframework/core/ResolvableTypeTests.java
View File

@@ -43,6 +43,7 @@ import java.util.TreeSet;
import java.util.concurrent.Callable;
import org.hamcrest.Matchers;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -1337,6 +1338,7 @@ public class ResolvableTypeTests {
assertTrue(setClass.isAssignableFrom(fromReturnType));
}
@Ignore
@Test
public void testSpr16456() throws Exception {
ResolvableType genericType = ResolvableType.forField(