unregister MessageLongPollObserver after taking notice and emitting n…

…otifications!
svencc · Oct 20, 2023 · c75c3b1 · c75c3b1
1 parent a1c2332
commit c75c3b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/main/java/com/recom/observer/Subject.java b/src/main/java/com/recom/observer/Subject.java
@@ -23,7 +23,9 @@ public void observationStoppedThrough(final @NonNull Observing<T> observer) {
 
     @Override
     public void notifyObserversWith(@NonNull final Notification<T> notification) {
-        observersWatchingMe.forEach(observer -> observer.takeNotice(this, notification));
+        // run through a copy of the list to avoid ConcurrentModificationException when removing observers!
+        final List<Observing<T>> copiedObserversWatchingMe = new ArrayList<>(observersWatchingMe);
+        copiedObserversWatchingMe.forEach(observer -> observer.takeNotice(this, notification));
     }
 
     @Override

diff --git a/src/main/java/com/recom/service/messagebus/MessageLongPollObserver.java b/src/main/java/com/recom/service/messagebus/MessageLongPollObserver.java
@@ -67,6 +67,7 @@ public void takeNotice(
             responseBodyEmitter.completeWithError(e);
         } finally {
             responseBodyEmitter.complete();
+            subject.observationStoppedThrough(this);
         }
     }