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 2018/03/08 08:05:13 UTC
[camel] branch master updated: CAMEL-12335: Fixed NPE in camel-sjms
consumer if synchronous=true. Polished the logging code a bit.
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 0ff3783 CAMEL-12335: Fixed NPE in camel-sjms consumer if synchronous=true. Polished the logging code a bit.
0ff3783 is described below
commit 0ff3783f0d368703b5e7e9f38c963c4572de687d
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Mar 8 09:03:31 2018 +0100
CAMEL-12335: Fixed NPE in camel-sjms consumer if synchronous=true. Polished the logging code a bit.
---
.../apache/camel/component/sjms/SjmsConsumer.java | 4 +-
.../sjms/consumer/AbstractMessageHandler.java | 12 ++----
.../sjms/consumer/InOnlyMessageHandler.java | 19 ++------
.../sjms/consumer/InOutMessageHandler.java | 9 ++--
.../component/sjms/producer/InOnlyProducer.java | 5 ++-
.../component/sjms/producer/InOutProducer.java | 8 ++--
.../sjms/tx/SessionTransactionSynchronization.java | 9 ++--
.../InOnlyConsumerQueueSynchronousTest.java | 50 ++++++++++++++++++++++
8 files changed, 74 insertions(+), 42 deletions(-)
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java
index 8436b4a..536a2be 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsConsumer.java
@@ -225,13 +225,13 @@ public class SjmsConsumer extends DefaultConsumer {
AbstractMessageHandler messageHandler;
if (getEndpoint().getExchangePattern().equals(ExchangePattern.InOnly)) {
- if (isTransacted()) {
+ if (isTransacted() || isSynchronous()) {
messageHandler = new InOnlyMessageHandler(getEndpoint(), executor, synchronization);
} else {
messageHandler = new InOnlyMessageHandler(getEndpoint(), executor);
}
} else {
- if (isTransacted()) {
+ if (isTransacted() || isSynchronous()) {
messageHandler = new InOutMessageHandler(getEndpoint(), executor, synchronization);
} else {
messageHandler = new InOutMessageHandler(getEndpoint(), executor);
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java
index 1152c83..ed99e20 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/AbstractMessageHandler.java
@@ -47,12 +47,11 @@ public abstract class AbstractMessageHandler implements MessageListener {
private boolean transacted;
private boolean sharedJMSSession;
private boolean synchronous = true;
- private Synchronization synchronization;
+ private final Synchronization synchronization;
private boolean topic;
public AbstractMessageHandler(SjmsEndpoint endpoint, ExecutorService executor) {
- this.endpoint = endpoint;
- this.executor = executor;
+ this(endpoint, executor, null);
}
public AbstractMessageHandler(SjmsEndpoint endpoint, ExecutorService executor, Synchronization synchronization) {
@@ -61,18 +60,13 @@ public abstract class AbstractMessageHandler implements MessageListener {
this.executor = executor;
}
- /*
- * @see javax.jms.MessageListener#onMessage(javax.jms.Message)
- *
- * @param message
- */
@Override
public void onMessage(Message message) {
RuntimeCamelException rce = null;
try {
final Exchange exchange = getEndpoint().createExchange(message, getSession());
- log.debug("Processing Exchange.id:{}", exchange.getExchangeId());
+ log.debug("Processing ExchangeId: {}", exchange.getExchangeId());
if (isTransacted()) {
if (isSharedJMSSession()) {
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java
index ae27d27..6e4f67d 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOnlyMessageHandler.java
@@ -28,26 +28,14 @@ import org.apache.camel.spi.Synchronization;
*/
public class InOnlyMessageHandler extends AbstractMessageHandler {
- /**
- * @param endpoint
- * @param executor
- */
public InOnlyMessageHandler(SjmsEndpoint endpoint, ExecutorService executor) {
super(endpoint, executor);
}
- /**
- * @param endpoint
- * @param executor
- * @param synchronization
- */
public InOnlyMessageHandler(SjmsEndpoint endpoint, ExecutorService executor, Synchronization synchronization) {
super(endpoint, executor, synchronization);
}
- /**
- * @param exchange
- */
@Override
public void handleMessage(final Exchange exchange) {
if (log.isDebugEnabled()) {
@@ -56,8 +44,7 @@ public class InOnlyMessageHandler extends AbstractMessageHandler {
if (!exchange.isFailed()) {
NoOpAsyncCallback callback = new NoOpAsyncCallback();
if (isTransacted() || isSynchronous()) {
- // must process synchronous if transacted or configured to
- // do so
+ // must process synchronous if transacted or configured to do so
if (log.isDebugEnabled()) {
log.debug("Synchronous processing: Message[{}], Destination[{}] ", exchange.getIn().getBody(), getEndpoint().getEndpointUri());
}
@@ -70,7 +57,9 @@ public class InOnlyMessageHandler extends AbstractMessageHandler {
}
} else {
// process asynchronous using the async routing engine
- log.debug("Asynchronous processing: Message[{}], Destination[{}] ", exchange.getIn().getBody(), getEndpoint().getEndpointUri());
+ if (log.isDebugEnabled()) {
+ log.debug("Asynchronous processing: Message[{}], Destination[{}] ", exchange.getIn().getBody(), getEndpoint().getEndpointUri());
+ }
getProcessor().process(exchange, callback);
}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java
index 97def12..0518f58 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/consumer/InOutMessageHandler.java
@@ -91,8 +91,7 @@ public class InOutMessageHandler extends AbstractMessageHandler {
return;
} else {
if (isTransacted() || isSynchronous()) {
- // must process synchronous if transacted or configured to
- // do so
+ // must process synchronous if transacted or configured to do so
log.debug("Synchronous processing: Message[{}], Destination[{}] ", exchange.getIn().getBody(), getEndpoint().getEndpointUri());
try {
getProcessor().process(exchange);
@@ -103,7 +102,9 @@ public class InOutMessageHandler extends AbstractMessageHandler {
}
} else {
// process asynchronous using the async routing engine
- log.debug("Asynchronous processing: Message[{}], Destination[{}] ", exchange.getIn().getBody(), getEndpoint().getEndpointUri());
+ if (log.isDebugEnabled()) {
+ log.debug("Asynchronous processing: Message[{}], Destination[{}] ", exchange.getIn().getBody(), getEndpoint().getEndpointUri());
+ }
getProcessor().process(exchange, callback);
}
}
@@ -122,7 +123,7 @@ public class InOutMessageHandler extends AbstractMessageHandler {
try {
entry.getValue().close();
} catch (JMSException e) {
- log.debug("Cached MessageProducer with key:{} threw an unexpected exception", entry.getKey(), e);
+ log.debug("Cached MessageProducer with key: " + entry.getKey() + " threw an unexpected exception. This exception is ignored.", e);
}
}
producerCache.clear();
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
index 333c66c..0997719 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOnlyProducer.java
@@ -21,6 +21,7 @@ import java.util.Collection;
import java.util.List;
import javax.jms.Message;
import org.apache.camel.AsyncCallback;
+import org.apache.camel.CamelExchangeException;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.component.sjms.BatchMessage;
@@ -30,7 +31,7 @@ import org.apache.camel.component.sjms.TransactionCommitStrategy;
import org.apache.camel.component.sjms.tx.DefaultTransactionCommitStrategy;
/**
- * A Camel Producer that provides the InOnly Exchange pattern..
+ * A Camel Producer that provides the InOnly Exchange pattern.
*/
public class InOnlyProducer extends SjmsProducer {
@@ -76,7 +77,7 @@ public class InOnlyProducer extends SjmsProducer {
producer.getMessageProducer().send(message);
}
} catch (Exception e) {
- exchange.setException(new Exception("Unable to complete sending the message: ", e));
+ exchange.setException(new CamelExchangeException("Unable to complete sending the JMS message", exchange, e));
} finally {
releaseProducerCallback.release(producer);
callback.done(isSynchronous());
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
index 0fd7572..90c159ed9 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
@@ -94,7 +94,6 @@ public class InOutProducer extends SjmsProducer {
}
MessageConsumer messageConsumer = getEndpoint().getJmsObjectFactory().createMessageConsumer(session, replyToDestination, null, isTopic(), null, true, false, false);
messageConsumer.setMessageListener(new MessageListener() {
-
@Override
public void onMessage(final Message message) {
log.debug("Message Received in the Consumer Pool");
@@ -103,9 +102,8 @@ public class InOutProducer extends SjmsProducer {
Exchanger<Object> exchanger = EXCHANGERS.get(message.getJMSCorrelationID());
exchanger.exchange(message, getResponseTimeOut(), TimeUnit.MILLISECONDS);
} catch (Exception e) {
- log.error("Unable to exchange message: {}", message, e);
+ log.warn("Unable to exchange message: {}. This exception is ignored.", message, e);
}
-
}
});
answer = new MessageConsumerResources(session, messageConsumer, replyToDestination);
@@ -141,11 +139,11 @@ public class InOutProducer extends SjmsProducer {
protected void doStart() throws Exception {
if (isEndpointTransacted()) {
- throw new IllegalArgumentException("InOut exchange pattern is incompatible with transacted=true as it cuases a deadlock. Please use transacted=false or InOnly exchange pattern.");
+ throw new IllegalArgumentException("InOut exchange pattern is incompatible with transacted=true as it cause a deadlock. Please use transacted=false or InOnly exchange pattern.");
}
if (ObjectHelper.isEmpty(getNamedReplyTo())) {
- log.debug("No reply to destination is defined. Using temporary destinations.");
+ log.debug("No reply to destination is defined. Using temporary destinations.");
} else {
log.debug("Using {} as the reply to destination.", getNamedReplyTo());
}
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java
index d2cf09f..7bbe378 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/tx/SessionTransactionSynchronization.java
@@ -44,18 +44,17 @@ public class SessionTransactionSynchronization extends SynchronizationAdapter {
}
}
-
@Override
public void onFailure(Exchange exchange) {
try {
if (commitStrategy.rollback(exchange)) {
- LOG.debug("Processing failure of Exchange id: {}", exchange.getExchangeId());
+ LOG.debug("Processing failure of ExchangeId: {}", exchange.getExchangeId());
if (session != null && session.getTransacted()) {
session.rollback();
}
}
} catch (Exception e) {
- LOG.warn("Failed to rollback the session: {}", e.getMessage());
+ LOG.warn("Failed to rollback the JMS session: {}", e.getMessage());
}
}
@@ -63,13 +62,13 @@ public class SessionTransactionSynchronization extends SynchronizationAdapter {
public void onComplete(Exchange exchange) {
try {
if (commitStrategy.commit(exchange)) {
- LOG.debug("Processing completion of Exchange id: {}", exchange.getExchangeId());
+ LOG.debug("Processing completion of ExchangeId: {}", exchange.getExchangeId());
if (session != null && session.getTransacted()) {
session.commit();
}
}
} catch (Exception e) {
- LOG.warn("Failed to commit the session: {}", e.getMessage());
+ LOG.warn("Failed to commit the JMS session: {}", e.getMessage());
exchange.setException(e);
}
}
diff --git a/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueSynchronousTest.java b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueSynchronousTest.java
new file mode 100644
index 0000000..47af0ed
--- /dev/null
+++ b/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/consumer/InOnlyConsumerQueueSynchronousTest.java
@@ -0,0 +1,50 @@
+/**
+ * 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.sjms.consumer;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.sjms.support.JmsTestSupport;
+import org.junit.Test;
+
+public class InOnlyConsumerQueueSynchronousTest extends JmsTestSupport {
+
+ private static final String SJMS_QUEUE_NAME = "sjms:queue:in.only.consumer.queue?synchronous=true";
+ private static final String MOCK_RESULT = "mock:result";
+
+ @Test
+ public void testSynchronous() throws Exception {
+ final String expectedBody = "Hello World";
+ MockEndpoint mock = getMockEndpoint(MOCK_RESULT);
+ mock.expectedMessageCount(1);
+ mock.expectedBodiesReceived(expectedBody);
+
+ template.sendBody(SJMS_QUEUE_NAME, expectedBody);
+
+ mock.assertIsSatisfied();
+ }
+
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from(SJMS_QUEUE_NAME)
+ .to(MOCK_RESULT);
+ }
+ };
+ }
+
+}
--
To stop receiving notification emails like this one, please contact
davsclaus@apache.org.