Skip to content

Commit 0081e3b

Browse files
GuilhermeJGuilhermeJ
authored andcommitted
Merge remote-tracking branch 'origin/master'
2 parents 7dc86a9 + 4dc781b commit 0081e3b

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

lib/src/main/java/ua/naiksoftware/stomp/OkHttpConnectionProvider.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,9 @@ class OkHttpConnectionProvider extends AbstractConnectionProvider {
3737
@NonNull
3838
@Override
3939
public void rawDisconnect() {
40-
openedSocked.close(1000, "");
40+
if (openedSocked != null) {
41+
openedSocked.close(1000, "");
42+
}
4143
}
4244

4345
@Override

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)