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 d44fbda5edc887deb64288f27aa5354c001441ef
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Aug 6 14:47:03 2019 +0200
CAMEL-13828: DefaultExchangeHolder - Do not propgate exchange id
---
.../JmsInOutTransferExchangeInflightRepositoryFlushTest.java | 12 ++++++++----
.../org/apache/camel/impl/DefaultExchangeHolderTest.java | 5 -----
.../java/org/apache/camel/support/DefaultExchangeHolder.java | 3 ---
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutTransferExchangeInflightRepositoryFlushTest.java
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutTransferExchangeInflightRepositoryFlushTest.java
index 2b59fb8..0c83e9a 100644
---
a/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutTransferExchangeInflightRepositoryFlushTest.java
+++
b/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutTransferExchangeInflightRepositoryFlushTest.java
@@ -65,17 +65,21 @@ public class
JmsInOutTransferExchangeInflightRepositoryFlushTest extends CamelTe
return new RouteBuilder() {
public void configure() {
from("direct:start")
-
.inOut("activemq:responseGenerator?transferExchange=true&requestTimeout=5000")
- .to("mock:result");
+ .log("A ${exchangeId}")
+
.inOut("activemq:responseGenerator?transferExchange=true&requestTimeout=20000")
+ .log("A ${exchangeId}")
+ .to("log:result", "mock:result");
from("activemq:responseGenerator?transferExchange=true")
+ .log("B ${exchangeId}")
.process(new Processor() {
public void process(Exchange exchange) throws
Exception {
// there are 2 inflight (one for both routes)
assertEquals(2,
exchange.getContext().getInflightRepository().size());
- exchange.getIn().setBody(new
SerializableResponseDto(true));
+ exchange.getMessage().setBody(new
SerializableResponseDto(true));
}
- });
+ }).to("log:reply")
+ .log("B ${exchangeId}");
}
};
}
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 e7524e1..2b99d77 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,8 +31,6 @@ import org.junit.Test;
public class DefaultExchangeHolderTest extends ContextTestSupport {
- private String id;
-
@Test
public void testMarshal() throws Exception {
DefaultExchangeHolder holder = createHolder(true);
@@ -56,7 +54,6 @@ public class DefaultExchangeHolderTest extends
ContextTestSupport {
@Test
public void testUnmarshal() throws Exception {
- id = null;
Exchange exchange = new DefaultExchange(context);
DefaultExchangeHolder.unmarshal(exchange, createHolder(true));
@@ -66,7 +63,6 @@ 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
@@ -174,7 +170,6 @@ 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 ad37459..f8300de 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,7 +103,6 @@ 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()) {
@@ -137,7 +136,6 @@ 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()) {
@@ -162,7 +160,6 @@ 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);
