Repository: activemq Updated Branches: refs/heads/activemq-5.14.x 124bd1ae3 -> 853e80063 refs/heads/master b37b9eb5a -> 8447e1af2
AMQ-6402: Fixed potential NPE in OriginalDestinationPropagateStrategy Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/8447e1af Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/8447e1af Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/8447e1af Branch: refs/heads/master Commit: 8447e1af2d45479fb602a6c16982e7b00b52a5b0 Parents: b37b9eb Author: Claus Ibsen <[email protected]> Authored: Sat Aug 20 12:13:55 2016 +0200 Committer: Claus Ibsen <[email protected]> Committed: Sat Aug 20 12:13:55 2016 +0200 ---------------------------------------------------------------------- .../camel/component/OriginalDestinationPropagateStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/8447e1af/activemq-camel/src/main/java/org/apache/activemq/camel/component/OriginalDestinationPropagateStrategy.java ---------------------------------------------------------------------- diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/component/OriginalDestinationPropagateStrategy.java b/activemq-camel/src/main/java/org/apache/activemq/camel/component/OriginalDestinationPropagateStrategy.java index 84de369..8f4c9fd 100644 --- a/activemq-camel/src/main/java/org/apache/activemq/camel/component/OriginalDestinationPropagateStrategy.java +++ b/activemq-camel/src/main/java/org/apache/activemq/camel/component/OriginalDestinationPropagateStrategy.java @@ -40,7 +40,7 @@ public class OriginalDestinationPropagateStrategy implements MessageCreatedStrat if (exchange.getIn() instanceof JmsMessage) { JmsMessage msg = exchange.getIn(JmsMessage.class); Message jms = msg.getJmsMessage(); - if (message instanceof ActiveMQMessage) { + if (jms != null && jms instanceof ActiveMQMessage && message instanceof ActiveMQMessage) { ActiveMQMessage amq = (ActiveMQMessage) jms; if (amq.getOriginalDestination() == null) { ActiveMQDestination from = amq.getDestination();
