activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject activemq git commit: Handle the case where the remote doesn't set any properties resulting in a null instance being returned from the properties getter.
Date Wed, 15 Jun 2016 22:55:18 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 36237cb30 -> f595f3c20


Handle the case where the remote doesn't set any properties resulting in
a null instance being returned from the properties getter. 

Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/f595f3c2
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/f595f3c2
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/f595f3c2

Branch: refs/heads/master
Commit: f595f3c20d0eb1af9d4c285b0b3ea30adac0b590
Parents: 36237cb
Author: Timothy Bish <tabish121@gmail.com>
Authored: Wed Jun 15 18:55:00 2016 -0400
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Wed Jun 15 18:55:13 2016 -0400

----------------------------------------------------------------------
 .../org/apache/activemq/transport/amqp/client/AmqpConnection.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/f595f3c2/activemq-amqp/src/test/java/org/apache/activemq/transport/amqp/client/AmqpConnection.java
----------------------------------------------------------------------
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 00488b8..acda553 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<Connection>
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


Mime
View raw message