FIX: order by must be added in findEach also (#1163)

src/main/java/io/ebeaninternal/server/query/CQueryEngine.java

@@ -191,6 +191,7 @@ public class CQueryEngine {
    */
   public <T> QueryIterator<T> findIterate(OrmQueryRequest<T> request) {
 
+    prepareForPaging(request);
     CQuery<T> cquery = queryBuilder.buildQuery(request);
     request.setCancelableQuery(cquery);
 
@@ -326,18 +327,25 @@ public class CQueryEngine {
     return historySupport.getSysPeriodLower(rootTableAlias);
   }
 
+  /**
+   * deemed to be a be a paging query - check that the order by contains the id
+   * property to ensure unique row ordering for predicable paging but only in
+   * case, this is not a distinct query
+   * 
+   * @param request
+   */
+  private <T> void prepareForPaging(OrmQueryRequest<T> request) {
+    SpiQuery<T> query = request.getQuery();
+    if (!query.isDistinct() && (query.getMaxRows() > 1 || query.getFirstRow() > 0)) {
+      request.getBeanDescriptor().appendOrderById(query);
+    }
+  }
   /**
    * Find a list/map/set of beans.
    */
   <T> BeanCollection<T> findMany(OrmQueryRequest<T> request) {
 
-    SpiQuery<T> query = request.getQuery();
-    if (!query.isDistinct() && (query.getMaxRows() > 1 || query.getFirstRow() > 0)) {
-      // deemed to be a be a paging query - check that the order by contains
-      // the id property to ensure unique row ordering for predicable paging
-      // but only in case, this is not a distinct query
-      request.getBeanDescriptor().appendOrderById(query);
-    }
+    prepareForPaging(request);
 
     CQuery<T> cquery = queryBuilder.buildQuery(request);
     request.setCancelableQuery(cquery);
@@ -376,7 +384,7 @@ public class CQueryEngine {
       if (cquery != null) {
         cquery.close();
       }
-      if (query.isFutureFetch()) {
+      if (request.getQuery().isFutureFetch()) {
         // end the transaction for futureFindIds
         // as it had it's own transaction
         logger.debug("Future fetch completed!");