Merge pull request #1096 from functional-streams-for-scala/bugfix/dou…

…ble-close-scope Do no throw exception when scope is not anymore in hierarchy.
typelevel · Feb 26, 2018 · d3e83a9 · d3e83a9
2 parents 3eb6e97 + a9f8a1d
commit d3e83a9
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/core/shared/src/main/scala/fs2/internal/Algebra.scala b/core/shared/src/main/scala/fs2/internal/Algebra.scala
@@ -411,17 +411,23 @@ private[fs2] object Algebra {
           case close: Algebra.CloseScope[F, O] =>
             if (close.interruptFallback) onInterrupt(Right(close.scopeId))
             else {
-              scope.findSelfOrAncestor(close.scopeId) match {
-                case Some(toClose) =>
-                  F.flatMap(toClose.close) { r =>
-                    F.flatMap(toClose.openAncestor) { ancestor =>
-                      compileLoop(ancestor, f(r))
-                    }
+              def closeAndGo(toClose: CompileScope[F, O]) =
+                F.flatMap(toClose.close) { r =>
+                  F.flatMap(toClose.openAncestor) { ancestor =>
+                    compileLoop(ancestor, f(r))
                   }
+                }
+
+              scope.findSelfOrAncestor(close.scopeId) match {
+                case Some(toClose) => closeAndGo(toClose)
                 case None =>
-                  val rsn = new IllegalStateException(
-                    "Failed to close scope that is not active scope or ancestor")
-                  compileLoop(scope, f(Left(rsn)))
+                  scope.findSelfOrChild(close.scopeId).flatMap {
+                    case Some(toClose) => closeAndGo(toClose)
+                    case None          =>
+                      // indicates the scope is already closed
+                      compileLoop(scope, f(Right(())))
+                  }
+
               }
             }