Non-terminating cancel if acquire fails (#112)

* Non-terminating cancel if acquire fails Port of monix/monix#1175 * Non-terminating terminate if acquire fails Port of monix/monix#1175 * Test for terminate in acquire
monix · May 10, 2020 · 1aff73a · 1aff73a
1 parent 9a9148b
commit 1aff73a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/core/shared/src/main/scala/monix/bio/internal/TaskBracket.scala b/core/shared/src/main/scala/monix/bio/internal/TaskBracket.scala
@@ -205,10 +205,13 @@ private[monix] object TaskBracket {
             }
           }
 
-          def onError(ex: E): Unit =
+          def onError(ex: E): Unit = {
+            deferredRelease.complete(BIO.unit)(ctx.scheduler)
             cb.onError(ex)
+          }
 
           override def onTermination(e: Throwable): Unit = {
+            deferredRelease.complete(BIO.unit)(ctx.scheduler)
             cb.onTermination(e)
           }
         }

diff --git a/core/shared/src/test/scala/monix/bio/TaskBracketSuite.scala b/core/shared/src/test/scala/monix/bio/TaskBracketSuite.scala
@@ -396,4 +396,31 @@ object TaskBracketSuite extends BaseTestSuite {
     assertEquals(f.value, Some(Success(())))
   }
 
+  test("bracket can be canceled while failing to acquire") { implicit sc =>
+
+    val task = (BIO.sleep(2.second) >> BIO.raiseError[Unit](DummyException("BOOM")))
+      .bracket(_ => Task.unit)(_ => BIO.unit)
+
+    val cancelToken = task.runAsyncF(_ => ())
+
+    sc.tick(1.second)
+    val f = cancelToken.runToFuture
+
+    sc.tick(1.second)
+    assertEquals(f.value, Some(Success(())))
+  }
+
+  test("bracket can be canceled while terminating") { implicit sc =>
+
+    val task = (BIO.sleep(2.second) >> BIO.terminate(DummyException("BOOM")))
+      .bracket(_ => Task.unit)(_ => BIO.unit)
+
+    val cancelToken = task.runAsyncF(_ => ())
+
+    sc.tick(1.second)
+    val f = cancelToken.runToFuture
+
+    sc.tick(1.second)
+    assertEquals(f.value, Some(Success(())))
+  }
 }