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 2017/06/28 15:33:15 UTC

[1/2] camel git commit: CAMEL-11461 Resolve concurrentConsumers and limitConcurrentConsumers from the registry.

Repository: camel
Updated Branches:
  refs/heads/camel-2.19.x fc3647c21 -> e180eeeee
  refs/heads/master e6a7caecc -> 149dd15b8


CAMEL-11461 Resolve concurrentConsumers and limitConcurrentConsumers from the registry.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/149dd15b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/149dd15b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/149dd15b

Branch: refs/heads/master
Commit: 149dd15b8c267b3a60e4d6c403d500f84ccf080c
Parents: e6a7cae
Author: Ion Savin <io...@tora.com>
Authored: Tue Jun 27 10:40:36 2017 +0300
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jun 28 17:32:36 2017 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/camel/component/seda/SedaComponent.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/149dd15b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
index de81076..b968119 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
@@ -169,8 +169,8 @@ public class SedaComponent extends UriEndpointComponent {
     @Override
     @SuppressWarnings("unchecked")
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
-        int consumers = getAndRemoveParameter(parameters, "concurrentConsumers", Integer.class, concurrentConsumers);
-        boolean limitConcurrentConsumers = getAndRemoveParameter(parameters, "limitConcurrentConsumers", Boolean.class, true);
+        int consumers = getAndRemoveOrResolveReferenceParameter(parameters, "concurrentConsumers", Integer.class, concurrentConsumers);
+        boolean limitConcurrentConsumers = getAndRemoveOrResolveReferenceParameter(parameters, "limitConcurrentConsumers", Boolean.class, true);
         if (limitConcurrentConsumers && consumers >  maxConcurrentConsumers) {
             throw new IllegalArgumentException("The limitConcurrentConsumers flag in set to true. ConcurrentConsumers cannot be set at a value greater than "
                     + maxConcurrentConsumers + " was " + consumers);

[2/2] camel git commit: CAMEL-11461 Resolve concurrentConsumers and limitConcurrentConsumers from the registry.

Posted by da...@apache.org.
CAMEL-11461 Resolve concurrentConsumers and limitConcurrentConsumers from the registry.


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e180eeee
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e180eeee
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e180eeee

Branch: refs/heads/camel-2.19.x
Commit: e180eeeee5e4b907968dd7e84590bdae16670700
Parents: fc3647c
Author: Ion Savin <io...@tora.com>
Authored: Tue Jun 27 10:40:36 2017 +0300
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jun 28 17:33:07 2017 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/camel/component/seda/SedaComponent.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/e180eeee/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
index de81076..b968119 100644
--- a/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
+++ b/camel-core/src/main/java/org/apache/camel/component/seda/SedaComponent.java
@@ -169,8 +169,8 @@ public class SedaComponent extends UriEndpointComponent {
     @Override
     @SuppressWarnings("unchecked")
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
-        int consumers = getAndRemoveParameter(parameters, "concurrentConsumers", Integer.class, concurrentConsumers);
-        boolean limitConcurrentConsumers = getAndRemoveParameter(parameters, "limitConcurrentConsumers", Boolean.class, true);
+        int consumers = getAndRemoveOrResolveReferenceParameter(parameters, "concurrentConsumers", Integer.class, concurrentConsumers);
+        boolean limitConcurrentConsumers = getAndRemoveOrResolveReferenceParameter(parameters, "limitConcurrentConsumers", Boolean.class, true);
         if (limitConcurrentConsumers && consumers >  maxConcurrentConsumers) {
             throw new IllegalArgumentException("The limitConcurrentConsumers flag in set to true. ConcurrentConsumers cannot be set at a value greater than "
                     + maxConcurrentConsumers + " was " + consumers);