From 462adb5a79ddea57db0e56d98380e7c8f68c1c58 Mon Sep 17 00:00:00 2001
From: Alexei Guevara <alexei.guevara@intelliware.ca>
Date: Tue, 23 Apr 2013 11:51:50 -0400
Subject: [PATCH] Fixed issue DATAREST-82

---
 .../rest/repository/invoke/RepositoryMethodInvoker.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/invoke/RepositoryMethodInvoker.java b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/invoke/RepositoryMethodInvoker.java
index 736164bde..0cc19fbd6 100644
--- a/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/invoke/RepositoryMethodInvoker.java
+++ b/spring-data-rest-repository/src/main/java/org/springframework/data/rest/repository/invoke/RepositoryMethodInvoker.java
@@ -1,6 +1,7 @@
 package org.springframework.data.rest.repository.invoke;
 
-import static org.springframework.util.ReflectionUtils.*;
+import static org.springframework.util.ReflectionUtils.doWithMethods;
+import static org.springframework.util.ReflectionUtils.invokeMethod;
 
 import java.io.Serializable;
 import java.lang.reflect.Method;
@@ -13,6 +14,7 @@ import org.springframework.data.domain.Sort;
 import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.rest.repository.support.ResourceMappingUtils;
+import org.springframework.util.ReflectionUtils.MethodCallback;
 
 /**
  * @author Jon Brisbin
@@ -64,10 +66,10 @@ public class RepositoryMethodInvoker implements PagingAndSortingRepository<Objec
 					findOne = repoMethod;
 				} else if("exists".equals(name)) {
 					exists = repoMethod;
-				} else if("findAll".equals(name) && someMethod) {
-					findSome = repoMethod;
 				} else if("findAll".equals(name) && sortable) {
 					findAllSorted = repoMethod;
+				} else if("findAll".equals(name) && someMethod) {
+					findSome = repoMethod;
 				} else if("findAll".equals(name) && pageable) {
 					findAllPaged = repoMethod;
 				} else if("findAll".equals(name)) {