mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-09-23 06:29:10 +00:00
Fix NPE in ResponseBodyEmitterReturnValueHandler
The possibility of NPE was introduced in the previous commit: https://github.com/spring-projects/spring-framework/commit/971ccab038ad8e549d515a80e2d64c5d4c80c86b Issue: SPR-14046
This commit is contained in:
+5
-3
@@ -81,9 +81,11 @@ public class ResponseBodyEmitterReturnValueHandler implements AsyncHandlerMethod
|
||||
}
|
||||
|
||||
private ResponseBodyEmitterAdapter getAdapterFor(Class<?> type) {
|
||||
for (Class<?> adapteeType : getAdapterMap().keySet()) {
|
||||
if (adapteeType.isAssignableFrom(type)) {
|
||||
return getAdapterMap().get(adapteeType);
|
||||
if (type != null) {
|
||||
for (Class<?> adapteeType : getAdapterMap().keySet()) {
|
||||
if (adapteeType.isAssignableFrom(type)) {
|
||||
return getAdapterMap().get(adapteeType);
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
|
||||
+5
@@ -81,6 +81,7 @@ public class ResponseBodyEmitterReturnValueHandlerTests {
|
||||
assertTrue(this.handler.supportsReturnType(returnType("handleResponseEntity")));
|
||||
assertFalse(this.handler.supportsReturnType(returnType("handleResponseEntityString")));
|
||||
assertFalse(this.handler.supportsReturnType(returnType("handleResponseEntityParameterized")));
|
||||
assertFalse(this.handler.supportsReturnType(returnType("handleRawResponseEntity")));
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -229,6 +230,10 @@ public class ResponseBodyEmitterReturnValueHandlerTests {
|
||||
return null;
|
||||
}
|
||||
|
||||
private ResponseEntity handleRawResponseEntity() {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static class SimpleBean {
|
||||
|
||||
Reference in New Issue
Block a user