From f595f3c20d0eb1af9d4c285b0b3ea30adac0b590 Mon Sep 17 00:00:00 2001 From: Timothy Bish Date: Wed, 15 Jun 2016 18:55:00 -0400 Subject: [PATCH] Handle the case where the remote doesn't set any properties resulting in a null instance being returned from the properties getter. --- .../apache/activemq/transport/amqp/client/AmqpConnection.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java index 00488b8820..acda553a87 100644 --- a/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java +++ b/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java @@ -532,7 +532,8 @@ public class AmqpConnection extends AmqpAbstractResource implements @Override protected void doOpenCompletion() { // If the remote indicates that a close is pending, don't open. - if (!getEndpoint().getRemoteProperties().containsKey(CONNECTION_OPEN_FAILED)) { + if (getEndpoint().getRemoteProperties() == null || + !getEndpoint().getRemoteProperties().containsKey(CONNECTION_OPEN_FAILED)) { if (!isIdleProcessingDisabled()) { // Using nano time since it is not related to the wall clock, which may change