admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent StackOverflowError in AbstractJackson2HttpMessageConverter

Browse Source 
Issue: SPR-14520
This commit is contained in:
Sebastien Deleuze
2016-08-04 11:11:15 -07:00
parent fad931d764
commit e86529ec90
2 changed files with 35 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/main/java/org/springframework/http/converter/json/AbstractJackson2HttpMessageConverter.java
+7 -3
View File
@@ -357,9 +357,13 @@ public abstract class AbstractJackson2HttpMessageConverter extends AbstractGener
return resolvedType;
}
}
resolvedType = resolveVariable(typeVariable, contextType.getSuperType());
if (resolvedType.resolve() != null) {
return resolvedType;
ResolvableType superType = contextType.getSuperType();
if (superType != ResolvableType.NONE) {
resolvedType = resolveVariable(typeVariable, superType);
if (resolvedType.resolve() != null) {
return resolvedType;
}
}
for (ResolvableType ifc : contextType.getInterfaces()) {
resolvedType = resolveVariable(typeVariable, ifc);