You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/04/10 09:32:52 UTC

[2/3] git commit: CAMEL-7351: Fixed potential NPE when tracing and capturing from a context scoped onException.

CAMEL-7351: Fixed potential NPE when tracing and capturing from a context scoped onException.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/68d3f233
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/68d3f233
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/68d3f233

Branch: refs/heads/camel-2.13.x
Commit: 68d3f233b0d11d17ffc17987db1b5c18da265cd3
Parents: 35cb56a
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Apr 10 09:22:21 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Apr 10 09:36:17 2014 +0200

----------------------------------------------------------------------
 .../java/org/apache/camel/processor/CamelInternalProcessor.java   | 2 +-
 .../processor/interceptor/DefaultBacklogTracerEventMessage.java   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/68d3f233/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
index 46b2b24..7ebd726 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/CamelInternalProcessor.java
@@ -519,7 +519,7 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor {
                         backlogTracer.isBodyIncludeStreams(), backlogTracer.isBodyIncludeFiles(), backlogTracer.getBodyMaxChars());
 
                 // if first we should add a pseudo trace message as well, so we have a starting message (eg from the route)
-                String routeId = routeDefinition.getId();
+                String routeId = routeDefinition != null ? routeDefinition.getId() : null;
                 if (first) {
                     Date created = exchange.getProperty(Exchange.CREATED_TIMESTAMP, timestamp, Date.class);
                     DefaultBacklogTracerEventMessage pseudo = new DefaultBacklogTracerEventMessage(backlogTracer.incrementTraceCounter(), created, routeId, null, exchangeId, messageAsXml);

http://git-wip-us.apache.org/repos/asf/camel/blob/68d3f233/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
index 4cb5dff..0db7283 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/interceptor/DefaultBacklogTracerEventMessage.java
@@ -91,7 +91,8 @@ public final class DefaultBacklogTracerEventMessage implements BacklogTracerEven
         sb.append(prefix).append("  <uid>").append(uid).append("</uid>\n");
         String ts = new SimpleDateFormat(TIMESTAMP_FORMAT).format(timestamp);
         sb.append(prefix).append("  <timestamp>").append(ts).append("</timestamp>\n");
-        sb.append(prefix).append("  <routeId>").append(routeId).append("</routeId>\n");
+        // route id is optional and we then use an empty value for no route id
+        sb.append(prefix).append("  <routeId>").append(routeId != null ? routeId : "").append("</routeId>\n");
         if (toNode != null) {
             sb.append(prefix).append("  <toNode>").append(toNode).append("</toNode>\n");
         } else {