check/handle already completed results for exceptions

symplely · Nov 9, 2019 · da1c365 · da1c365
1 parent 7521903
commit da1c365
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/Coroutine/Kernel.php b/Coroutine/Kernel.php
@@ -437,6 +437,7 @@ function (TaskInterface $task, CoroutineInterface $coroutine) use ($taskId) {
                     $completeList = $coroutine->completedList();
                     $countComplete = \count($completeList);
                     $gatherCompleteCount = 0;
+                    $isResultsException = false;
 
                     // Check and handle tasks already completed before entering/executing gather().
                     if ($countComplete > 0) {
@@ -448,7 +449,14 @@ function (TaskInterface $task, CoroutineInterface $coroutine) use ($taskId) {
                                     $result = $tasks->result();
                                 }
 
-                                $results[$id] = $result;
+                                if ($result instanceof \Throwable) {
+                                    // @codeCoverageIgnoreStart
+                                    $isResultsException = $result;
+                                    // @codeCoverageIgnoreEnd
+                                } else {
+                                    $results[$id] = $result;
+                                }
+
                                 $count--;
                                 $gatherCompleteCount++;
                                 unset($taskIdList[$id]);
@@ -604,9 +612,16 @@ function (TaskInterface $task, CoroutineInterface $coroutine) use ($taskId) {
                     }
                 }
 
-                self::$gatherResumer = null;
-                $task->sendValue($results);
-                $coroutine->schedule($task);
+                if ($gatherShouldError && $isResultsException !== false) {
+                    // @codeCoverageIgnoreStart
+                    $task->setException($isResultsException);
+                    $coroutine->schedule($tasks);
+                    // @codeCoverageIgnoreEnd
+                } else {
+                    self::$gatherResumer = null;
+                    $task->sendValue($results);
+                    $coroutine->schedule($task);
+                }
             }
         );
     }