Merge pull request #1951 from TimWSpence/fix-future-leak

jatcwang · web-flow · commit dc960d95654c · 2023-11-17T23:45:04.000Z
Fix future leak
diff --git a/modules/free/src/main/scala/doobie/WeakAsync.scala b/modules/free/src/main/scala/doobie/WeakAsync.scala
@@ -58,8 +58,10 @@ object WeakAsync {
       F.syncStep[G, T](fa, Int.MaxValue).flatMap { // MaxValue b/c we assume G will implement ceding/fairness
         case Left(fa) =>
           G.fromFutureCancelable {
-            G.delay(dispatcher.unsafeToFutureCancelable(fa)).map { case (fut, cancel) =>
-              (fut, G.fromFuture(G.delay(cancel())))
+            G.uncancelable { _ =>
+              G.delay(dispatcher.unsafeToFutureCancelable(fa)).map { case (fut, cancel) =>
+                (fut, G.fromFuture(G.delay(cancel())))
+              }
             }
           }
         case Right(a) => G.pure(a)

Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,10 @@ object WeakAsync {`
`58`	`58`	`F.syncStep[G, T](fa, Int.MaxValue).flatMap { // MaxValue b/c we assume G will implement ceding/fairness`
`59`	`59`	`case Left(fa) =>`
`60`	`60`	`G.fromFutureCancelable {`
`61`		`- G.delay(dispatcher.unsafeToFutureCancelable(fa)).map { case (fut, cancel) =>`
`62`		`- (fut, G.fromFuture(G.delay(cancel())))`
	`61`	`+ G.uncancelable { _ =>`
	`62`	`+ G.delay(dispatcher.unsafeToFutureCancelable(fa)).map { case (fut, cancel) =>`
	`63`	`+ (fut, G.fromFuture(G.delay(cancel())))`
	`64`	`+ }`
`63`	`65`	`}`
`64`	`66`	`}`
`65`	`67`	`case Right(a) => G.pure(a)`