You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2017/04/13 11:35:59 UTC
[1/2] camel git commit: Fix test
Repository: camel
Updated Branches:
refs/heads/master d661a7a33 -> 8075724b7
Fix test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8075724b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8075724b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8075724b
Branch: refs/heads/master
Commit: 8075724b7e08908956b295fe4b293d7cfb1ae080
Parents: 7a136a0
Author: lburgazzoli <lb...@gmail.com>
Authored: Thu Apr 13 13:35:12 2017 +0200
Committer: lburgazzoli <lb...@gmail.com>
Committed: Thu Apr 13 13:35:41 2017 +0200
----------------------------------------------------------------------
.../test/java/org/apache/camel/management/ManagedProcessTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/8075724b/camel-core/src/test/java/org/apache/camel/management/ManagedProcessTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedProcessTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedProcessTest.java
index 334a67c..faa0a45 100644
--- a/camel-core/src/test/java/org/apache/camel/management/ManagedProcessTest.java
+++ b/camel-core/src/test/java/org/apache/camel/management/ManagedProcessTest.java
@@ -82,7 +82,7 @@ public class ManagedProcessTest extends ManagementTestSupport {
String json = (String) mbeanServer.invoke(on, "informationJson", null, null);
assertNotNull(json);
- assertTrue(json.contains("\"description\": \"Calls a Camel processor."));
+ assertTrue(json.contains("\"description\": \"Calls a Camel processor"));
}
@Override
[2/2] camel git commit: Add some assertions around correctness of the
imput and fix some multi-threading potential issue
Posted by lb...@apache.org.
Add some assertions around correctness of the imput and fix some multi-threading potential issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7a136a01
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7a136a01
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7a136a01
Branch: refs/heads/master
Commit: 7a136a0151d9412d3f793a0d40ea698f0aa6089f
Parents: d661a7a
Author: lburgazzoli <lb...@gmail.com>
Authored: Thu Apr 13 13:34:21 2017 +0200
Committer: lburgazzoli <lb...@gmail.com>
Committed: Thu Apr 13 13:35:41 2017 +0200
----------------------------------------------------------------------
.../camel/impl/cloud/RandomServiceChooser.java | 26 +++++++++++---------
.../impl/cloud/RoundRobinServiceChooser.java | 15 ++++++++---
2 files changed, 25 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7a136a01/camel-core/src/main/java/org/apache/camel/impl/cloud/RandomServiceChooser.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/RandomServiceChooser.java b/camel-core/src/main/java/org/apache/camel/impl/cloud/RandomServiceChooser.java
index 4117769..2b6c8d4 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/cloud/RandomServiceChooser.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cloud/RandomServiceChooser.java
@@ -17,28 +17,30 @@
package org.apache.camel.impl.cloud;
import java.util.List;
-import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
import org.apache.camel.cloud.ServiceChooser;
import org.apache.camel.cloud.ServiceDefinition;
+import org.apache.camel.util.ObjectHelper;
public class RandomServiceChooser implements ServiceChooser {
- private final Random random;
-
- public RandomServiceChooser() {
- this.random = new Random();
- }
-
@Override
- public ServiceDefinition choose(List<ServiceDefinition> servers) {
- int size = servers.size();
- int index = (size > 1) ? random.nextInt(size) : 0;
+ public ServiceDefinition choose(List<ServiceDefinition> definitions) {
+ // Fail if the service definition list is null or empty
+ if (ObjectHelper.isEmpty(definitions)) {
+ throw new IllegalArgumentException("The ServiceDefinition list should not be empty");
+ }
- return servers.get(index);
+ int size = definitions.size();
+ if (size == 1) {
+ return definitions.get(0);
+ } else {
+ return definitions.get(ThreadLocalRandom.current().nextInt(size));
+ }
}
@Override
public String toString() {
- return "RandomServiceCallServiceChooser";
+ return "RandomServiceChooser";
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7a136a01/camel-core/src/main/java/org/apache/camel/impl/cloud/RoundRobinServiceChooser.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/cloud/RoundRobinServiceChooser.java b/camel-core/src/main/java/org/apache/camel/impl/cloud/RoundRobinServiceChooser.java
index e5ef1b5..369c3c0 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/cloud/RoundRobinServiceChooser.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/cloud/RoundRobinServiceChooser.java
@@ -20,21 +20,28 @@ import java.util.List;
import org.apache.camel.cloud.ServiceChooser;
import org.apache.camel.cloud.ServiceDefinition;
+import org.apache.camel.util.ObjectHelper;
public class RoundRobinServiceChooser implements ServiceChooser {
private int counter = -1;
@Override
- public ServiceDefinition choose(List<ServiceDefinition> servers) {
- int size = servers.size();
+ public synchronized ServiceDefinition choose(List<ServiceDefinition> definitions) {
+ // Fail if the service definition list is null or empty
+ if (ObjectHelper.isEmpty(definitions)) {
+ throw new IllegalArgumentException("The ServiceDefinition list should not be empty");
+ }
+
+ int size = definitions.size();
if (size == 1 || ++counter >= size) {
counter = 0;
}
- return servers.get(counter);
+
+ return definitions.get(counter);
}
@Override
public String toString() {
- return "RoundRobinServiceCallServiceChooser";
+ return "RoundRobinServiceChooser";
}
}