Handle the case where the remote doesn't set any properties resulting in

a null instance being returned from the properties getter.
fenglove · Jun 15, 2016 · f595f3c · f595f3c
1 parent 36237cb
commit f595f3c
Showing 1 changed file with 2 additions and 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
@@ -532,7 +532,8 @@ public void onTransportError(Throwable cause) {
     @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