Fix #13

NaikSoftware · Dec 15, 2016 · e1d1a5e · e1d1a5e
1 parent 7a49472
commit e1d1a5e
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java b/lib/src/main/java/ua/naiksoftware/stomp/WebSocketsConnectionProvider.java
@@ -55,8 +55,9 @@ public Observable<String> messages() {
             mMessagesSubscribers.add(subscriber);
 
         }).doOnUnsubscribe(() -> {
-            for (Subscriber<? super String> subscriber : mMessagesSubscribers) {
-                if (subscriber.isUnsubscribed()) mMessagesSubscribers.remove(subscriber);
+            Iterator<Subscriber<? super String>> iterator = mMessagesSubscribers.iterator();
+            while (iterator.hasNext()) {
+                if (iterator.next().isUnsubscribed()) iterator.remove();
             }
 
             if (mMessagesSubscribers.size() < 1) mWebSocketClient.close();
@@ -157,8 +158,9 @@ public Observable<LifecycleEvent> getLifecycleReceiver() {
             mLifecycleSubscribers.add(subscriber);
 
         }).doOnUnsubscribe(() -> {
-            for (Subscriber<? super LifecycleEvent> subscriber : mLifecycleSubscribers) {
-                if (subscriber.isUnsubscribed()) mLifecycleSubscribers.remove(subscriber);
+            Iterator<Subscriber<? super LifecycleEvent>> iterator = mLifecycleSubscribers.iterator();
+            while (iterator.hasNext()) {
+                if (iterator.next().isUnsubscribed()) iterator.remove();
             }
         });
     }