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

DATAREST-60 Only set the errback parameter if one is configured in the RepositoryRestConfiguration.

Browse Source
This commit is contained in:
Jon Brisbin
2013-01-22 10:02:20 -06:00
committed by Jon Brisbin
parent f4945a61bb
commit 9f082f00fd
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/AbstractRepositoryRestController.java
View File

@@ -244,7 +244,9 @@ public class AbstractRepositoryRestController implements ApplicationContextAware
HttpHeaders headers,
HttpStatus status) {
String callback = repoRequest.getRequest().getParameter(config.getJsonpParamName());
String errback = repoRequest.getRequest().getParameter(config.getJsonpOnErrParamName());
String errback = (null != config.getJsonpOnErrParamName()
? repoRequest.getRequest().getParameter(config.getJsonpOnErrParamName())
: null);
ResponseEntity<T> newResponse;
if(null != headers) {
newResponse = new ResponseEntity<T>(response, headers, status);