Skip to content

Commit 08631fe

Browse files
Daria Komkovaforresthopkinsa
authored andcommitted
Unsubscribe from messages on disconnect
1 parent efcb19f commit 08631fe

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public class StompClient {
4444
private ConcurrentHashMap<String, Observable<StompMessage>> mStreamMap;
4545
private Parser parser;
4646
private Subscription lifecycleSub;
47+
private Subscription messagesSubscription;
4748
private List<StompHeader> mHeaders;
4849
private int heartbeat;
4950

@@ -133,7 +134,7 @@ public void connect(@Nullable List<StompHeader> _headers) {
133134
});
134135

135136
isConnecting = true;
136-
mConnectionProvider.messages()
137+
messagesSubscription = mConnectionProvider.messages()
137138
.map(StompMessage::from)
138139
.doOnNext(this::callSubscribers)
139140
.filter(msg -> msg.getStompCommand().equals(StompCommand.CONNECTED))
@@ -179,6 +180,7 @@ public Observable<LifecycleEvent> lifecycle() {
179180
public void disconnect() {
180181
resetStatus();
181182
lifecycleSub.unsubscribe();
183+
messagesSubscription.unsubscribe();
182184
mConnectionProvider.disconnect().subscribe(() -> mConnected = false);
183185
}
184186

0 commit comments

Comments
 (0)