Rest: fixed filters execution order to be from lowest to highest rath…

…er than the other way around Closes elastic#7019
javanna · Jul 28, 2014 · 4e5ad56 · 4e5ad56
1 parent 0e9594e
commit 4e5ad56
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/org/elasticsearch/rest/RestController.java b/src/main/java/org/elasticsearch/rest/RestController.java
@@ -86,7 +86,7 @@ public synchronized void registerFilter(RestFilter preProcessor) {
         Arrays.sort(copy, new Comparator<RestFilter>() {
             @Override
             public int compare(RestFilter o1, RestFilter o2) {
-                return o2.order() - o1.order();
+                return Integer.compare(o1.order(), o2.order());
             }
         });
         filters = copy;

diff --git a/src/test/java/org/elasticsearch/rest/RestFilterChainTests.java b/src/test/java/org/elasticsearch/rest/RestFilterChainTests.java
@@ -60,7 +60,7 @@ public void testRestFilters() throws InterruptedException {
         Collections.sort(restFiltersByOrder, new Comparator<RestFilter>() {
             @Override
             public int compare(RestFilter o1, RestFilter o2) {
-                return Integer.compare(o2.order(), o1.order());
+                return Integer.compare(o1.order(), o2.order());
             }
         });