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
The following commit(s) were added to refs/heads/master by this push:
new 6ce8cb9 Fixed test
6ce8cb9 is described below
commit 6ce8cb971ba4311b6f658a4d54f7180bdcaa10da
Author: Claus Ibsen <[email protected]>
AuthorDate: Sun Mar 29 17:00:55 2020 +0200
Fixed test
---
.../apache/camel/component/jgroups/CamelJGroupsReceiver.java | 7 ++-----
.../org/apache/camel/component/jgroups/JGroupsComponent.java | 4 +++-
.../org/apache/camel/component/jgroups/JGroupsEndpoint.java | 11 +++++++----
.../camel/component/jgroups/JGroupsClusterRouteTest.java | 2 --
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/CamelJGroupsReceiver.java
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/CamelJGroupsReceiver.java
index 67c7817..9fcdef8 100644
---
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/CamelJGroupsReceiver.java
+++
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/CamelJGroupsReceiver.java
@@ -72,11 +72,8 @@ public class CamelJGroupsReceiver extends ReceiverAdapter {
Exchange exchange = endpoint.createExchange(message);
try {
LOG.debug("Processing message: {}", message);
- processor.process(exchange, new AsyncCallback() {
- @Override
- public void done(boolean doneSync) {
- // noop
- }
+ processor.process(exchange, doneSync -> {
+ // noop
});
} catch (Exception e) {
throw new JGroupsException("Error in consumer while dispatching
exchange containing message " + message, e);
diff --git
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java
index e86886c..cff59d3 100644
---
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java
+++
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java
@@ -42,7 +42,9 @@ public class JGroupsComponent extends DefaultComponent {
@Override
protected Endpoint createEndpoint(String uri, String clusterName,
Map<String, Object> parameters) throws Exception {
- return new JGroupsEndpoint(uri, this, channel, clusterName,
channelProperties, enableViewMessages);
+ JGroupsEndpoint endpoint = new JGroupsEndpoint(uri, this, channel,
clusterName, channelProperties, enableViewMessages);
+ setProperties(endpoint, parameters);
+ return endpoint;
}
public JChannel getChannel() {
diff --git
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
index a1409ed..60406b9 100644
---
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
+++
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
@@ -73,7 +73,9 @@ public class JGroupsEndpoint extends DefaultEndpoint {
@Override
public Consumer createConsumer(Processor processor) throws Exception {
- return new JGroupsConsumer(this, processor, resolvedChannel,
clusterName);
+ JGroupsConsumer consumer = new JGroupsConsumer(this, processor,
resolvedChannel, clusterName);
+ configureConsumer(consumer);
+ return consumer;
}
public Exchange createExchange(Message message) {
@@ -106,8 +108,10 @@ public class JGroupsEndpoint extends DefaultEndpoint {
@Override
protected void doStop() throws Exception {
- LOG.trace("Closing JGroups Channel {}", getEndpointUri());
- resolvedChannel.close();
+ if (resolvedChannel != null) {
+ LOG.trace("Closing JGroups Channel {}", getEndpointUri());
+ resolvedChannel.close();
+ }
super.doStop();
}
@@ -123,7 +127,6 @@ public class JGroupsEndpoint extends DefaultEndpoint {
/**
* Connect shared channel, called by producer and consumer.
- * @throws Exception
*/
public void connect() throws Exception {
connectCount.incrementAndGet();
diff --git
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterRouteTest.java
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterRouteTest.java
index 218c511..d33a6b3 100644
---
a/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterRouteTest.java
+++
b/components/camel-jgroups/src/test/java/org/apache/camel/component/jgroups/JGroupsClusterRouteTest.java
@@ -107,9 +107,7 @@ public class JGroupsClusterRouteTest extends Assert {
expectMasterIsNot(firstCamelContext);
firstCamelContext.stop();
- assertMasterIsNot(firstCamelContext);
- expectMasterIsNot(firstCamelContext);
firstCamelContext.start();
assertMasterIsNot(firstCamelContext);