Fix notices in NativeReactor; prepare tag 1.2.2

amphp · May 12, 2016 · 4f2161d · 4f2161d
1 parent 87a5f29
commit 4f2161d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+### 1.2.2
+
+- Fix notice in NativeReactor when removing a handle while
+  an event is waiting for it. (Regression fix from 1.1.1)
+
 ### 1.2.1
 
 - Fix uv_run() potentially exiting earlier than intended,

diff --git a/lib/NativeReactor.php b/lib/NativeReactor.php
@@ -241,16 +241,21 @@ private function selectActionableStreams($timeout) {
         if (!@stream_select($r, $w, $e, $sec, $usec)) {
             return;
         }
+        // check for if (!empty($watchers[$streamId])) as they may have been removed during another callback
         foreach ($r as $stream) {
             $streamId = (int) $stream;
-            foreach ($this->readWatchers[$streamId] as $watcherId => $watcher) {
-                $this->doIoCallback($watcherId, $watcher, $stream);
+            if (!empty($this->readWatchers[$streamId])) {
+                foreach ($this->readWatchers[$streamId] as $watcherId => $watcher) {
+                    $this->doIoCallback($watcherId, $watcher, $stream);
+                }
             }
         }
         foreach ($w as $stream) {
             $streamId = (int) $stream;
-            foreach ($this->writeWatchers[$streamId] as $watcherId => $watcher) {
-                $this->doIoCallback($watcherId, $watcher, $stream);
+            if (!empty($this->writeWatchers[$streamId])) {
+                foreach ($this->writeWatchers[$streamId] as $watcherId => $watcher) {
+                    $this->doIoCallback($watcherId, $watcher, $stream);
+                }
             }
         }
     }