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 2021/03/19 14:03:42 UTC
[camel] branch master updated (96c8a29 -> d30aae8)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 96c8a29 Added unit test based on user question
new e5824f6 CAMEL-16295: fix aggregation when in transacted route
new d30aae8 Regen
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/camel/processor/MulticastProcessor.java | 8 +++-----
.../processor/intercept/InterceptSendToRecipientListTest.java | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
[camel] 02/02: Regen
Posted by da...@apache.org.
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 d30aae87c46ac57cb4156d39a818e5bc2889e831
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Mar 19 15:02:32 2021 +0100
Regen
---
.../camel/processor/intercept/InterceptSendToRecipientListTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToRecipientListTest.java b/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToRecipientListTest.java
index e393708..87b5092 100644
--- a/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToRecipientListTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/processor/intercept/InterceptSendToRecipientListTest.java
@@ -44,7 +44,7 @@ public class InterceptSendToRecipientListTest extends ContextTestSupport {
interceptSendToEndpoint("seda:b*").skipSendToOriginalEndpoint().to("mock:intercepted");
from("direct:start")
- .recipientList().header("whereTo").to("mock:result");
+ .recipientList().header("whereTo").to("mock:result");
}
};
[camel] 01/02: CAMEL-16295: fix aggregation when in transacted route
Posted by da...@apache.org.
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 e5824f6aecee646e5eb47b87780b6824d0456962
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Mar 19 14:59:33 2021 +0100
CAMEL-16295: fix aggregation when in transacted route
---
.../main/java/org/apache/camel/processor/MulticastProcessor.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
index 75e2a90..265bf2f 100644
--- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
+++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/MulticastProcessor.java
@@ -596,11 +596,9 @@ public class MulticastProcessor extends AsyncProcessorSupport
});
// next step
- if (hasNext && !isParallelProcessing()) {
- return true;
- } else {
- return false;
- }
+ boolean next = hasNext && !isParallelProcessing();
+ LOG.trace("Run next: {}", next);
+ return next;
}
}