From ff385f71c592ff218956cfa3b1b0a184604b8409 Mon Sep 17 00:00:00 2001
From: Mikael Mengistu <mikaelm12@users.noreply.github.com>
Date: Tue, 11 Dec 2018 16:22:06 -0800
Subject: [PATCH] Check connectionState in stop so we don't null ref (#4557)

---
 .../src/main/java/com/microsoft/signalr/HubConnection.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
index 5b255ec9bd..2ad841d798 100644
--- a/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+++ b/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
@@ -436,8 +436,11 @@ public class HubConnection {
                 exception = new RuntimeException(errorMessage);
                 logger.error("HubConnection disconnected with an error {}.", errorMessage);
             }
-            connectionState.cancelOutstandingInvocations(exception);
-            connectionState = null;
+            if (connectionState != null) {
+                connectionState.cancelOutstandingInvocations(exception);
+                connectionState = null;
+            }
+
             logger.info("HubConnection stopped.");
             hubConnectionState = HubConnectionState.DISCONNECTED;
             handshakeResponseSubject.onComplete();