From 695f4ca9c00464599b57b99627759bfa9bc062b8 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Tue, 1 Mar 2011 20:42:14 +0100
Subject: [PATCH] Fixed sorting not being applied if provided via method
 parameter.

AbstractQueryCreator now uses the Sort object from the parameters if the PartTree not already contains a Sort object (which got there due to a OrderBy directive in the method name).
---
 .../data/repository/query/parser/AbstractQueryCreator.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/parser/AbstractQueryCreator.java b/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/parser/AbstractQueryCreator.java
index 3ccdf52b1..182811375 100644
--- a/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/parser/AbstractQueryCreator.java
+++ b/spring-data-commons-core/src/main/java/org/springframework/data/repository/query/parser/AbstractQueryCreator.java
@@ -62,7 +62,10 @@ public abstract class AbstractQueryCreator<T, S> {
      */
     public T createQuery() {
 
-        return complete(createCriteria(tree), tree.getSort());
+        Sort treeSort = tree.getSort();
+        Sort sort = treeSort != null ? treeSort : parameters.getSort();
+
+        return complete(createCriteria(tree), sort);
     }