Fix #136 remove element from list being parsed

Conflicts: org.jrebirth.af/core/src/main/java/org/jrebirth/af/core/link/NotifierBase.java
JRebirth · Sep 26, 2014 · 20df623 · 20df623
1 parent 40dbd0c
commit 20df623
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/org.jrebirth.af/core/src/main/java/org/jrebirth/af/core/link/NotifierBase.java b/org.jrebirth.af/core/src/main/java/org/jrebirth/af/core/link/NotifierBase.java
@@ -353,18 +353,25 @@ public void unlisten(final WaveReady<?> linkedObject, final WaveType... waveType
      * {@inheritDoc}
      */
     @Override
-    public void unlistenAll(WaveReady<?> linkedObject) throws JRebirthThreadException {
+    public void unlistenAll(final WaveReady<?> linkedObject) throws JRebirthThreadException {
 
+        // This method is called into JIT (all method call are serialized)
+        // to avoid any thread concurrency trouble
         JRebirth.checkJIT();
 
-        for (WaveSubscription ws : notifierMap.values()) {
+        // Iterate over all WaveSubscription
+        for (final WaveSubscription ws : this.notifierMap.values()) {
 
-            for (final WaveHandler wh : ws.getWaveHandlers()) {
+            for (int i = ws.getWaveHandlers().size() - 1; i >= 0; i--) {
+                final WaveHandler wh = ws.getWaveHandlers().get(i);
+                // If the WaveHandler concern the linked object
                 if (wh.getWaveReady() == linkedObject) {
-                    ws.getWaveHandlers().remove(wh);
+                    // Remove it from registration list
+                    ws.getWaveHandlers().remove(i);
                 }
             }
 
+            // If this WaveSubscription doesn't contain any WaveHandler remove the entry.
             if (ws.getWaveHandlers().isEmpty()) {
                 this.notifierMap.remove(ws.getWaveType());
             }