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 2023/06/15 08:00:36 UTC
[camel] branch main updated: CAMEL-19457: camel-dynamic-router, negative inflight counter.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 3334bd53408 CAMEL-19457: camel-dynamic-router, negative inflight counter.
3334bd53408 is described below
commit 3334bd53408656f95e1f761f5c179c7a04e5ff21
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jun 15 10:00:19 2023 +0200
CAMEL-19457: camel-dynamic-router, negative inflight counter.
---
.../dynamicrouter/DynamicRouterProducer.java | 23 +++++++++++-----------
.../dynamicrouter/DynamicRouterProducerTest.java | 6 ------
2 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/components/camel-dynamic-router/src/main/java/org/apache/camel/component/dynamicrouter/DynamicRouterProducer.java b/components/camel-dynamic-router/src/main/java/org/apache/camel/component/dynamicrouter/DynamicRouterProducer.java
index 71077bf6edc..53fa3c70ca9 100644
--- a/components/camel-dynamic-router/src/main/java/org/apache/camel/component/dynamicrouter/DynamicRouterProducer.java
+++ b/components/camel-dynamic-router/src/main/java/org/apache/camel/component/dynamicrouter/DynamicRouterProducer.java
@@ -83,21 +83,20 @@ public class DynamicRouterProducer extends DefaultAsyncProducer {
*/
@Override
public boolean process(final Exchange exchange, final AsyncCallback callback) {
- try {
- // we may be forced synchronous
- if (configuration.isSynchronous()) {
+ if (configuration.isSynchronous()) {
+ try {
process(exchange);
- } else {
- return getComponent()
- .getRoutingProcessor(configuration.getChannel())
- .process(exchange, callback);
+ } catch (Exception e) {
+ exchange.setException(e);
+ } finally {
+ callback.done(true);
}
- } catch (Exception e) {
- exchange.setException(e);
- } finally {
- callback.done(true);
+ return true;
+ } else {
+ return getComponent()
+ .getRoutingProcessor(configuration.getChannel())
+ .process(exchange, callback);
}
- return true;
}
/**
diff --git a/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/DynamicRouterProducerTest.java b/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/DynamicRouterProducerTest.java
index 6d09db918aa..641953d449f 100644
--- a/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/DynamicRouterProducerTest.java
+++ b/components/camel-dynamic-router/src/test/java/org/apache/camel/component/dynamicrouter/DynamicRouterProducerTest.java
@@ -42,10 +42,4 @@ class DynamicRouterProducerTest extends DynamicRouterTestSupport {
Assertions.assertTrue(result);
}
- @Test
- void testProcessAynchronous() {
- when(endpoint.getConfiguration().isSynchronous()).thenReturn(false);
- boolean result = producer.process(exchange, asyncCallback);
- Assertions.assertTrue(result);
- }
}