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 2019/11/07 17:40:58 UTC
[camel] branch camel-2.x updated: CAMEL-14148 fix (#3327)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push:
new 44492f0 CAMEL-14148 fix (#3327)
44492f0 is described below
commit 44492f0a221ecbc4545f97544783033b999bac68
Author: Bas Claessen <35...@users.noreply.github.com>
AuthorDate: Thu Nov 7 18:40:41 2019 +0100
CAMEL-14148 fix (#3327)
---
.../jms/reply/TemporaryQueueReplyManager.java | 10 ++-
...tReplyTemporaryRefreshFailureOnStartupTest.java | 95 ++++++++++++++++++++++
2 files changed, 102 insertions(+), 3 deletions(-)
diff --git a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
index 42423a3..824e034 100644
--- a/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
+++ b/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
@@ -199,7 +199,8 @@ public class TemporaryQueueReplyManager extends ReplyManagerSupport {
public Destination resolveDestinationName(Session session, String destinationName, boolean pubSubDomain) throws JMSException {
// use a temporary queue to gather the reply message
synchronized (refreshWanted) {
- if (queue == null || refreshWanted.compareAndSet(true, false)) {
+ if (queue == null || refreshWanted.get()) {
+ refreshWanted.set(false);
queue = session.createTemporaryQueue();
setReplyTo(queue);
if (log.isDebugEnabled()) {
@@ -218,8 +219,11 @@ public class TemporaryQueueReplyManager extends ReplyManagerSupport {
public void destinationReady() throws InterruptedException {
if (refreshWanted.get()) {
synchronized (refreshWanted) {
- log.debug("Waiting for new Temporary ReplyTo queue to be assigned before we can continue");
- refreshWanted.wait();
+ //check if requestWanted is still true
+ if (refreshWanted.get()) {
+ log.debug("Waiting for new Temporary ReplyTo queue to be assigned before we can continue");
+ refreshWanted.wait();
+ }
}
}
}
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsRequestReplyTemporaryRefreshFailureOnStartupTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsRequestReplyTemporaryRefreshFailureOnStartupTest.java
new file mode 100644
index 0000000..183d988
--- /dev/null
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsRequestReplyTemporaryRefreshFailureOnStartupTest.java
@@ -0,0 +1,95 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jms.temp;
+
+import java.util.concurrent.TimeUnit;
+import javax.jms.ConnectionFactory;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+import static org.apache.camel.component.jms.JmsComponent.jmsComponentAutoAcknowledge;
+
+public class JmsRequestReplyTemporaryRefreshFailureOnStartupTest extends CamelTestSupport {
+
+ private String brokerName;
+ private Long recoveryInterval = 1000L;
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ brokerName = "test-broker-" + System.currentTimeMillis();
+ CamelContext camelContext = super.createCamelContext();
+
+ ConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://" + brokerName + "?create=false");
+ camelContext.addComponent("jms", jmsComponentAutoAcknowledge(connectionFactory));
+
+ return camelContext;
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .inOut("jms:queue:foo?recoveryInterval=" + recoveryInterval)
+ .to("mock:result");
+
+ from("jms:queue:foo")
+ .setBody(simple("pong"));
+ }
+ };
+ }
+
+ @Test
+ public void testTemporaryRefreshFailureOnStartup() throws Exception {
+ //the first message will fail
+ //the second message must be handled
+ MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
+ mockEndpoint.expectedMessageCount(1);
+
+ //the first request will return with an error
+ //because the broker is not started yet
+ try {
+ template.requestBody("direct:start", "ping");
+ } catch (Exception exception) {
+
+ }
+ //wait for connection recovery before starting the broker
+ Thread.sleep(recoveryInterval + 500L);
+ String brokerUri = "vm://" + brokerName;
+ BrokerService broker = new BrokerService();
+ broker.setBrokerName(brokerName);
+ broker.setBrokerId(brokerName);
+ broker.setPersistent(false);
+ broker.setUseJmx(false);
+ broker.addConnector(brokerUri);
+ broker.start();
+ //wait for the next recovery attempt
+ Thread.sleep(recoveryInterval + 500L);
+ template.asyncRequestBody("direct:start", "ping");
+
+ assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
+ broker.stop();
+ }
+
+}