This closes #1613

2017-10-25 10:02:13 -04:00 · 2017-10-25 10:02:13 -04:00 · 6407580b66
parent 75c88410f0 de1165df6e
commit 6407580b66
1 changed files with 1 additions and 1 deletions
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/ProtocolHandler.java
@ -154,7 +154,7 @@ public class ProtocolHandler {
            return;
         }

-         if (handshakeTimeout > 0) {
+         if (handshakeTimeout > 0 && timeoutFuture != null) {
            timeoutFuture.cancel(true);
            timeoutFuture = null;
         }