root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

polishing

This commit is contained in:
Juergen Hoeller 2011-12-12 15:04:11 +00:00
parent 23e58aa718
commit 450a3d7eee
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.test/src/main/java/org/springframework/mock/web/MockHttpServletRequest.java
View File

@ -306,7 +306,7 @@ public class MockHttpServletRequest implements HttpServletRequest {
private void updateContentTypeHeader() { private void updateContentTypeHeader() {
if (this.contentType != null) { if (this.contentType != null) {
StringBuilder sb = new StringBuilder(this.contentType); StringBuilder sb = new StringBuilder(this.contentType);
if (this.contentType.toLowerCase().indexOf(CHARSET_PREFIX) == -1 && this.characterEncoding != null) { if (!this.contentType.toLowerCase().contains(CHARSET_PREFIX) && this.characterEncoding != null) {
sb.append(";").append(CHARSET_PREFIX).append(this.characterEncoding); sb.append(";").append(CHARSET_PREFIX).append(this.characterEncoding);
} }
doAddHeaderValue(CONTENT_TYPE_HEADER, sb.toString(), true); doAddHeaderValue(CONTENT_TYPE_HEADER, sb.toString(), true);

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

@ -990,7 +990,7 @@ public class AnnotationMethodHandlerAdapter extends WebContentGenerator
HttpInputMessage inputMessage = createHttpInputMessage(webRequest); HttpInputMessage inputMessage = createHttpInputMessage(webRequest);
HttpOutputMessage outputMessage = createHttpOutputMessage(webRequest); HttpOutputMessage outputMessage = createHttpOutputMessage(webRequest);
if (responseEntity instanceof ResponseEntity && outputMessage instanceof ServerHttpResponse) { if (responseEntity instanceof ResponseEntity && outputMessage instanceof ServerHttpResponse) {
((ServerHttpResponse)outputMessage).setStatusCode(((ResponseEntity) responseEntity).getStatusCode()); ((ServerHttpResponse) outputMessage).setStatusCode(((ResponseEntity) responseEntity).getStatusCode());
} }
HttpHeaders entityHeaders = responseEntity.getHeaders(); HttpHeaders entityHeaders = responseEntity.getHeaders();
if (!entityHeaders.isEmpty()) { if (!entityHeaders.isEmpty()) {

1
org.springframework.web/src/main/java/org/springframework/web/multipart/MultipartRequest.java
View File

@ -79,6 +79,7 @@ public interface MultipartRequest {
* Determine the content type of the specified request part. * Determine the content type of the specified request part.
* @param paramOrFileName the name of the part * @param paramOrFileName the name of the part
* @return the associated content type, or <code>null</code> if not defined * @return the associated content type, or <code>null</code> if not defined
* @since 3.1
*/ */
String getMultipartContentType(String paramOrFileName); String getMultipartContentType(String paramOrFileName);