Use timeout at bottom of queue

icicleio · Dec 29, 2015 · 752aed5 · 752aed5
1 parent 2fe9b23
commit 752aed5
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/Pipe/WritablePipe.php b/src/Pipe/WritablePipe.php
@@ -166,9 +166,7 @@ private function send($data, $timeout = 0, $end = false)
 
             yield $delayed;
         } catch (Exception $exception) {
-            if ($this->isOpen()) {
-                $this->free($exception);
-            }
+            $this->free($exception);
             throw $exception;
         } finally {
             if ($end && $this->isOpen()) {
@@ -219,9 +217,7 @@ public function await($timeout = 0)
         try {
             yield $delayed;
         } catch (Exception $exception) {
-            if ($this->isOpen()) {
-                $this->free($exception);
-            }
+            $this->free($exception);
             throw $exception;
         }
     }
@@ -297,7 +293,7 @@ private function createAwait($resource, \SplQueue $writeQueue)
             }
 
             if (!$writeQueue->isEmpty()) {
-                list( , , $timeout) = $writeQueue->top();
+                list( , , $timeout) = $writeQueue->bottom();
                 $await->listen($timeout);
             }
         });