You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zh...@apache.org on 2023/02/17 14:57:57 UTC
[camel] branch camel-3.20.x updated: CAMEL-19068: remove SAGA_LONG_RUNNING_ACTION in out Message (#9368)
This is an automated email from the ASF dual-hosted git repository.
zhfeng pushed a commit to branch camel-3.20.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.20.x by this push:
new 93c81cfdf8a CAMEL-19068: remove SAGA_LONG_RUNNING_ACTION in out Message (#9368)
93c81cfdf8a is described below
commit 93c81cfdf8aae6b9198dd51322b0ad860bb50ec5
Author: Zheng Feng <zh...@gmail.com>
AuthorDate: Fri Feb 17 15:49:50 2023 +0800
CAMEL-19068: remove SAGA_LONG_RUNNING_ACTION in out Message (#9368)
---
.../src/main/java/org/apache/camel/processor/saga/SagaProcessor.java | 1 +
.../src/test/java/org/apache/camel/processor/SagaPropagationTest.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
index b0c78c6e2bf..2e0354de516 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/saga/SagaProcessor.java
@@ -67,6 +67,7 @@ public abstract class SagaProcessor extends DelegateAsyncProcessor implements Tr
exchange.getIn().setHeader(Exchange.SAGA_LONG_RUNNING_ACTION, coordinator.getId());
} else {
exchange.getIn().removeHeader(Exchange.SAGA_LONG_RUNNING_ACTION);
+ exchange.getMessage().removeHeader(Exchange.SAGA_LONG_RUNNING_ACTION);
}
}
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/SagaPropagationTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/SagaPropagationTest.java
index 3db08ceb2db..ec1d255c997 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/SagaPropagationTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/SagaPropagationTest.java
@@ -67,7 +67,7 @@ public class SagaPropagationTest extends ContextTestSupport {
context.createFluentProducerTemplate().to("direct:supports").request();
assertListSize(sagaIds, 2);
- assertNonNullSagaIds(2);
+ assertNonNullSagaIds(1);
}
@Test