Repository: camel Updated Branches: refs/heads/camel-2.12.x 124835080 -> 022735f61 refs/heads/camel-2.13.x 22ba8062a -> 280e6216f refs/heads/master 7f05a94e3 -> 913d589b6
Polished Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ff196a18 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ff196a18 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ff196a18 Branch: refs/heads/master Commit: ff196a183a08434649f7a803779cf402a6d4d9aa Parents: 7f05a94 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Apr 25 07:48:51 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Apr 25 07:48:51 2014 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/camel/impl/DefaultMessageHistory.java | 4 +++- .../src/main/java/org/apache/camel/util/MessageHelper.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ff196a18/camel-core/src/main/java/org/apache/camel/impl/DefaultMessageHistory.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultMessageHistory.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultMessageHistory.java index 0d9bade..b7b1f73 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultMessageHistory.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultMessageHistory.java @@ -26,12 +26,14 @@ public class DefaultMessageHistory implements MessageHistory { private final String routeId; private final NamedNode node; + private final String nodeId; private final Date timestamp; private final StopWatch stopWatch; public DefaultMessageHistory(String routeId, NamedNode node, Date timestamp) { this.routeId = routeId; this.node = node; + this.nodeId = node.getId(); this.timestamp = timestamp; this.stopWatch = new StopWatch(); } @@ -60,7 +62,7 @@ public class DefaultMessageHistory implements MessageHistory { public String toString() { return "DefaultMessageHistory[" + "routeId=" + routeId - + ", node=" + node.getId() + + ", node=" + nodeId + ']'; } } http://git-wip-us.apache.org/repos/asf/camel/blob/ff196a18/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java index c81b53b..088b316 100644 --- a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java +++ b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java @@ -460,7 +460,7 @@ public final class MessageHelper { // and then each history for (MessageHistory history : list) { - routeId = history.getRouteId(); + routeId = history.getRouteId() != null ? history.getRouteId() : ""; id = history.getNode().getId(); label = history.getNode().getLabel(); elapsed = history.getElapsed();
