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

DATACMNS-640 - Fixed potential NullPointerException in PageableHandlerMethodArgumentResolver.

Browse Source 
We now double check the fallback Pageable for being null before trying to lookup the Sort to fall back.
This commit is contained in:
Oliver Gierke
2015-02-04 10:32:17 +01:00
parent 57a42ababd
commit 2b4d173320
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/springframework/data/web/PageableHandlerMethodArgumentResolver.java
View File

@@ -246,7 +246,11 @@ public class PageableHandlerMethodArgumentResolver implements HandlerMethodArgum
pageSize = pageSize > maxPageSize ? maxPageSize : pageSize;
Sort sort = sortResolver.resolveArgument(methodParameter, mavContainer, webRequest, binderFactory);
return new PageRequest(page, pageSize, sort == null ? defaultOrFallback.getSort() : sort);
// Default if necessary and default configured
sort = sort == null && defaultOrFallback != null ? defaultOrFallback.getSort() : sort;
return new PageRequest(page, pageSize, sort);
}
/**