Fix disconnect before connect

NaikSoftware · Jun 26, 2018 · c17b197 · c17b197
1 parent f02fdae
commit c17b197
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -186,8 +186,12 @@ public void disconnect() {
     }
 
     public Completable disconnectCompletable() {
-        mLifecycleDisposable.dispose();
-        mMessagesDisposable.dispose();
+        if (mLifecycleDisposable != null) {
+            mLifecycleDisposable.dispose();
+        }
+        if (mMessagesDisposable != null) {
+            mMessagesDisposable.dispose();
+        }
         return mConnectionProvider.disconnect()
                 .doOnComplete(() -> setConnected(false));
     }