Skip to content

Commit e1d1a5e

Browse files
author
savchenko_n
committed
Fix #13
1 parent 7a49472 commit e1d1a5e

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ public Observable<String> messages() {
5555
mMessagesSubscribers.add(subscriber);
5656

5757
}).doOnUnsubscribe(() -> {
58-
for (Subscriber<? super String> subscriber : mMessagesSubscribers) {
59-
if (subscriber.isUnsubscribed()) mMessagesSubscribers.remove(subscriber);
58+
Iterator<Subscriber<? super String>> iterator = mMessagesSubscribers.iterator();
59+
while (iterator.hasNext()) {
60+
if (iterator.next().isUnsubscribed()) iterator.remove();
6061
}
6162

6263
if (mMessagesSubscribers.size() < 1) mWebSocketClient.close();
@@ -157,8 +158,9 @@ public Observable<LifecycleEvent> getLifecycleReceiver() {
157158
mLifecycleSubscribers.add(subscriber);
158159

159160
}).doOnUnsubscribe(() -> {
160-
for (Subscriber<? super LifecycleEvent> subscriber : mLifecycleSubscribers) {
161-
if (subscriber.isUnsubscribed()) mLifecycleSubscribers.remove(subscriber);
161+
Iterator<Subscriber<? super LifecycleEvent>> iterator = mLifecycleSubscribers.iterator();
162+
while (iterator.hasNext()) {
163+
if (iterator.next().isUnsubscribed()) iterator.remove();
162164
}
163165
});
164166
}

0 commit comments

Comments
 (0)