Skip to content

Commit c17b197

Browse files
committed
Fix disconnect before connect
1 parent f02fdae commit c17b197

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,12 @@ public void disconnect() {
186186
}
187187

188188
public Completable disconnectCompletable() {
189-
mLifecycleDisposable.dispose();
190-
mMessagesDisposable.dispose();
189+
if (mLifecycleDisposable != null) {
190+
mLifecycleDisposable.dispose();
191+
}
192+
if (mMessagesDisposable != null) {
193+
mMessagesDisposable.dispose();
194+
}
191195
return mConnectionProvider.disconnect()
192196
.doOnComplete(() -> setConnected(false));
193197
}

0 commit comments

Comments
 (0)