Repository: camel Updated Branches: refs/heads/master 83b11c961 -> 5d4bb0d70
CAMEL-11442: Optimise - Use existing exchange id as breadcrumb Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5d4bb0d7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5d4bb0d7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5d4bb0d7 Branch: refs/heads/master Commit: 5d4bb0d708dc2b0f770d15ec9bfb1dc790f6a469 Parents: 83b11c9 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Jun 23 16:31:26 2017 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Jun 23 16:31:26 2017 +0200 ---------------------------------------------------------------------- .../src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java | 4 ++-- .../src/test/java/org/apache/camel/processor/BreadcrumbTest.java | 4 ++-- .../java/org/apache/camel/processor/MDCWithBreadcrumbTest.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/5d4bb0d7/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java index f6a7ef8..585bc60 100644 --- a/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java +++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultUnitOfWork.java @@ -114,8 +114,8 @@ public class DefaultUnitOfWork implements UnitOfWork, Service { // create or use existing breadcrumb String breadcrumbId = exchange.getIn().getHeader(Exchange.BREADCRUMB_ID, String.class); if (breadcrumbId == null) { - // no existing breadcrumb, so create a new one based on the message id - breadcrumbId = exchange.getIn().getMessageId(); + // no existing breadcrumb, so create a new one based on the exchange id + breadcrumbId = exchange.getExchangeId(); exchange.getIn().setHeader(Exchange.BREADCRUMB_ID, breadcrumbId); } } http://git-wip-us.apache.org/repos/asf/camel/blob/5d4bb0d7/camel-core/src/test/java/org/apache/camel/processor/BreadcrumbTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/BreadcrumbTest.java b/camel-core/src/test/java/org/apache/camel/processor/BreadcrumbTest.java index 583a575..4934fba 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/BreadcrumbTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/BreadcrumbTest.java @@ -37,7 +37,7 @@ public class BreadcrumbTest extends MDCTest { from("direct:a").routeId("route-a") .process(new Processor() { public void process(Exchange exchange) throws Exception { - assertEquals(exchange.getIn().getMessageId(), exchange.getIn().getHeader("breadcrumbId")); + assertEquals(exchange.getExchangeId(), exchange.getIn().getHeader("breadcrumbId")); } }) .to("log:foo").to("direct:b"); @@ -45,7 +45,7 @@ public class BreadcrumbTest extends MDCTest { from("direct:b").routeId("route-b") .process(new Processor() { public void process(Exchange exchange) throws Exception { - assertEquals(exchange.getIn().getMessageId(), exchange.getIn().getHeader("breadcrumbId")); + assertEquals(exchange.getExchangeId(), exchange.getIn().getHeader("breadcrumbId")); } }) .to("log:bar").to("mock:result"); http://git-wip-us.apache.org/repos/asf/camel/blob/5d4bb0d7/camel-core/src/test/java/org/apache/camel/processor/MDCWithBreadcrumbTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/processor/MDCWithBreadcrumbTest.java b/camel-core/src/test/java/org/apache/camel/processor/MDCWithBreadcrumbTest.java index 3c0f5f5..35c6816 100644 --- a/camel-core/src/test/java/org/apache/camel/processor/MDCWithBreadcrumbTest.java +++ b/camel-core/src/test/java/org/apache/camel/processor/MDCWithBreadcrumbTest.java @@ -40,7 +40,7 @@ public class MDCWithBreadcrumbTest extends MDCTest { public void process(Exchange exchange) throws Exception { assertEquals("route-a", MDC.get("camel.routeId")); assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId")); - assertEquals(exchange.getIn().getMessageId(), MDC.get("camel.breadcrumbId")); + assertEquals(exchange.getExchangeId(), MDC.get("camel.breadcrumbId")); } }) .to("log:foo").to("direct:b"); @@ -50,7 +50,7 @@ public class MDCWithBreadcrumbTest extends MDCTest { public void process(Exchange exchange) throws Exception { assertEquals("route-b", MDC.get("camel.routeId")); assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId")); - assertEquals(exchange.getIn().getMessageId(), MDC.get("camel.breadcrumbId")); + assertEquals(exchange.getExchangeId(), MDC.get("camel.breadcrumbId")); } }) .to("log:bar").to("mock:result");
