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

DATAREST-23 Fix NPE when result of query is null.

Browse Source
This commit is contained in:
Jon Brisbin
2012-07-24 08:26:34 -05:00
parent 93d40b396b
commit 6867d07295
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/RepositoryRestController.java
View File

@@ -419,15 +419,19 @@ public class RepositoryRestController
Object result = queryMethod.method().invoke( repo, paramVals );
Iterator iter;
if ( result instanceof Collection ) {
iter = ((Collection) result).iterator();
} else if ( result instanceof Page ) {
page = (Page) result;
iter = page.iterator();
if ( null != result ) {
if ( result instanceof Collection ) {
iter = ((Collection) result).iterator();
} else if ( result instanceof Page ) {
page = (Page) result;
iter = page.iterator();
} else {
List l = new ArrayList();
l.add( result );
iter = l.iterator();
}
} else {
List l = new ArrayList();
l.add( result );
iter = l.iterator();
iter = Collections.emptyList().iterator();
}
Map<String, Object> resultMap = new HashMap<String, Object>();