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 2019/08/06 14:25:09 UTC
[camel] 03/04: Revert "CAMEL-13828: DefaultExchangeHolder - Do not
propgate exchange id"
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 08f046cf4d5e05e22a5cdf95028f28ffc4c2e2ff
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Aug 6 16:14:55 2019 +0200
Revert "CAMEL-13828: DefaultExchangeHolder - Do not propgate exchange id"
This reverts commit d44fbda5
---
.../test/java/org/apache/camel/impl/DefaultExchangeHolderTest.java | 5 +++++
.../main/java/org/apache/camel/support/DefaultExchangeHolder.java | 3 +++
2 files changed, 8 insertions(+)
diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeHolderTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeHolderTest.java
index 2b99d77..e7524e1 100644
--- a/core/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeHolderTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/impl/DefaultExchangeHolderTest.java
@@ -31,6 +31,8 @@ import org.junit.Test;
public class DefaultExchangeHolderTest extends ContextTestSupport {
+ private String id;
+
@Test
public void testMarshal() throws Exception {
DefaultExchangeHolder holder = createHolder(true);
@@ -54,6 +56,7 @@ public class DefaultExchangeHolderTest extends ContextTestSupport {
@Test
public void testUnmarshal() throws Exception {
+ id = null;
Exchange exchange = new DefaultExchange(context);
DefaultExchangeHolder.unmarshal(exchange, createHolder(true));
@@ -63,6 +66,7 @@ public class DefaultExchangeHolderTest extends ContextTestSupport {
assertEquals("Hi Camel", exchange.getIn().getHeader("CamelFoo"));
assertEquals(444, exchange.getProperty("bar"));
assertEquals(555, exchange.getProperty("CamelBar"));
+ assertEquals(id, exchange.getExchangeId());
}
@Test
@@ -170,6 +174,7 @@ public class DefaultExchangeHolderTest extends ContextTestSupport {
private DefaultExchangeHolder createHolder(boolean includeProperties) {
Exchange exchange = new DefaultExchange(context);
+ id = exchange.getExchangeId();
exchange.getIn().setBody("Hello World");
exchange.getIn().setHeader("foo", 123);
exchange.getIn().setHeader("CamelFoo", "Hi Camel");
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java b/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java
index f8300de..ad37459 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/DefaultExchangeHolder.java
@@ -103,6 +103,7 @@ public class DefaultExchangeHolder implements Serializable {
DefaultExchangeHolder payload = new DefaultExchangeHolder();
+ payload.exchangeId = exchange.getExchangeId();
payload.inBody = checkSerializableBody("in body", exchange, exchange.getIn().getBody());
payload.safeSetInHeaders(exchange, false);
if (exchange.hasOut()) {
@@ -136,6 +137,7 @@ public class DefaultExchangeHolder implements Serializable {
DefaultExchangeHolder payload = new DefaultExchangeHolder();
+ payload.exchangeId = exchange.getExchangeId();
payload.inBody = checkSerializableBody("in body", exchange, exchange.getIn().getBody());
payload.safeSetInHeaders(exchange, allowSerializedHeaders);
if (exchange.hasOut()) {
@@ -160,6 +162,7 @@ public class DefaultExchangeHolder implements Serializable {
ObjectHelper.notNull(exchange, "exchange");
ObjectHelper.notNull(payload, "payload");
+ exchange.setExchangeId(payload.exchangeId);
exchange.getIn().setBody(payload.inBody);
if (payload.inHeaders != null) {
exchange.getIn().setHeaders(payload.inHeaders);