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

SPR-6466 - ContentNegotiatingViewResolver can not handle View implementations returning null as content type 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2543 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Arjen Poutsma 2009-11-30 10:10:27 +00:00
parent d7906963a3
commit bc327a000e
2 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolver.java
View File

@ -350,12 +350,15 @@ public class ContentNegotiatingViewResolver extends WebApplicationObjectSupport
} }
for (View candidateView : candidateViews) { for (View candidateView : candidateViews) {
MediaType viewMediaType = MediaType.parseMediaType(candidateView.getContentType()); String contentType = candidateView.getContentType();
for (MediaType requestedMediaType : requestedMediaTypes) { if (StringUtils.hasText(contentType)) {
if (requestedMediaType.includes(viewMediaType)) { MediaType viewMediaType = MediaType.parseMediaType(contentType);
if (!views.containsKey(requestedMediaType)) { for (MediaType requestedMediaType : requestedMediaTypes) {
views.put(requestedMediaType, candidateView); if (requestedMediaType.includes(viewMediaType)) {
break; if (!views.containsKey(requestedMediaType)) {
views.put(requestedMediaType, candidateView);
break;
}
} }
} }
} }

25
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/view/ContentNegotiatingViewResolverTests.java
View File

@ -280,4 +280,29 @@ public class ContentNegotiatingViewResolverTests {
verify(viewResolverMock1, viewResolverMock2, viewMock1, viewMock2, viewMock3); verify(viewResolverMock1, viewResolverMock2, viewMock1, viewMock2, viewMock3);
} }
@Test
public void resolveViewContentTypeNull() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest("GET", "/test");
request.addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(request));
ViewResolver viewResolverMock = createMock(ViewResolver.class);
viewResolver.setViewResolvers(Collections.singletonList(viewResolverMock));
View viewMock = createMock("application_xml", View.class);
String viewName = "view";
Locale locale = Locale.ENGLISH;
expect(viewResolverMock.resolveViewName(viewName, locale)).andReturn(viewMock);
expect(viewMock.getContentType()).andReturn(null);
replay(viewResolverMock, viewMock);
View result = viewResolver.resolveViewName(viewName, locale);
assertNull("Invalid view", result);
verify(viewResolverMock, viewMock);
}
} }