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

SPR-7145 - NullPointerException in AnnotationMethodHandlerAdapter if HttpHeaders in ResponseEntity are empty

Browse Source
This commit is contained in:
Arjen Poutsma
2010-04-29 08:04:36 +00:00
parent aa216672ae
commit a910ce68ff
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/annotation/AnnotationMethodHandlerAdapter.java
View File

@@ -912,7 +912,10 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
if (!entityHeaders.isEmpty()) {
outputMessage.getHeaders().putAll(entityHeaders);
}
writeWithMessageConverters(responseEntity.getBody(), inputMessage, outputMessage);
Object body = responseEntity.getBody();
if (body != null) {
writeWithMessageConverters(body, inputMessage, outputMessage);
}
}
@SuppressWarnings("unchecked")