Repository: camel Updated Branches: refs/heads/master 6ff4e76b9 -> 8c20822b4
Polished Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8c20822b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8c20822b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8c20822b Branch: refs/heads/master Commit: 8c20822b4efb9fd49afdd3f7b046145f13567020 Parents: 6ff4e76 Author: Claus Ibsen <[email protected]> Authored: Thu Aug 6 10:05:54 2015 +0200 Committer: Claus Ibsen <[email protected]> Committed: Thu Aug 6 10:05:54 2015 +0200 ---------------------------------------------------------------------- .../apache/camel/commands/AbstractLocalCamelController.java | 8 +++++--- .../commands/jolokia/DefaultJolokiaCamelController.java | 9 ++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8c20822b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java index 8061b7c..ec1b997 100644 --- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java +++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractLocalCamelController.java @@ -462,13 +462,15 @@ public abstract class AbstractLocalCamelController extends AbstractCamelControll Collections.sort(answer, new Comparator<Map<String, String>>() { @Override public int compare(Map<String, String> endpoint1, Map<String, String> endpoint2) { + // sort by route id String route1 = endpoint1.get("routeId"); String route2 = endpoint2.get("routeId"); int num = route1.compareTo(route2); if (num == 0) { - String uri1 = endpoint1.get("uri"); - String uri2 = endpoint2.get("uri"); - num = uri1.compareTo(uri2); + // we want in before out + String dir1 = endpoint1.get("direction"); + String dir2 = endpoint2.get("direction"); + num = dir1.compareTo(dir2); } return num; } http://git-wip-us.apache.org/repos/asf/camel/blob/8c20822b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java ---------------------------------------------------------------------- diff --git a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java index eb08b71..daf7ad6 100644 --- a/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java +++ b/platforms/commands/commands-jolokia/src/main/java/org/apache/camel/commands/jolokia/DefaultJolokiaCamelController.java @@ -576,16 +576,19 @@ public class DefaultJolokiaCamelController extends AbstractCamelController imple Collections.sort(answer, new Comparator<Map<String, String>>() { @Override public int compare(Map<String, String> endpoint1, Map<String, String> endpoint2) { + // sort by route id String route1 = endpoint1.get("routeId"); String route2 = endpoint2.get("routeId"); int num = route1.compareTo(route2); if (num == 0) { - String uri1 = endpoint1.get("uri"); - String uri2 = endpoint2.get("uri"); - num = uri1.compareTo(uri2); + // we want in before out + String dir1 = endpoint1.get("direction"); + String dir2 = endpoint2.get("direction"); + num = dir1.compareTo(dir2); } return num; } + }); }
