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

Negated produces works with no Accept header present

Browse Source 
Issue: SPR-14299
This commit is contained in:
Rossen Stoyanchev
2016-05-31 14:44:27 -04:00
parent 8343ce9e44
commit 27215b5061
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/condition/ProducesRequestCondition.java
View File

@@ -26,6 +26,7 @@ import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import org.springframework.http.MediaType;
import org.springframework.web.HttpMediaTypeException;
import org.springframework.web.HttpMediaTypeNotAcceptableException;
import org.springframework.web.accept.ContentNegotiationManager;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -193,7 +194,18 @@ public final class ProducesRequestCondition extends AbstractRequestCondition<Pro
iterator.remove();
}
}
return (result.isEmpty()) ? null : new ProducesRequestCondition(result, this.contentNegotiationManager);
if (!result.isEmpty()) {
return new ProducesRequestCondition(result, this.contentNegotiationManager);
}
try {
if (getAcceptedMediaTypes(request).contains(MediaType.ALL)) {
return new ProducesRequestCondition();
}
}
catch (HttpMediaTypeException ex) {
// Ignore
}
return null;
}
/**