fix deadlock that occured, while shutting down Resource[F, JmsConnect…

…or[F]] (#383) * fix deadlock that occured, while shutting down Resource[F, JmsConnector[F]] * set empty mima
ocadotechnology · Aug 21, 2023 · dd9bce9 · dd9bce9
1 parent 7958d30
commit dd9bce9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build.sbt b/build.sbt
@@ -236,7 +236,7 @@ lazy val commonSettings = Seq(
   compilerOptions,
   Test / fork := true,
   libraryDependencies ++= compilerPlugins,
-  // mimaPreviousArtifacts := Seq(), // TODO
+  mimaPreviousArtifacts := Set(), // TODO
   libraryDependencies ++= Seq(
     "com.disneystreaming" %% "weaver-cats" % Versions.Weaver,
     "com.disneystreaming" %% "weaver-framework" % Versions.Weaver,

diff --git a/connectors/activemq/src/main/scala/com/ocadotechnology/pass4s/connectors/activemq/taps.scala b/connectors/activemq/src/main/scala/com/ocadotechnology/pass4s/connectors/activemq/taps.scala
@@ -142,8 +142,8 @@ private[activemq] object taps {
   }
 
   private def subscriberStream[F[_], A](subscriber: SinkQueueWithCancel[A])(implicit F: Async[F]): Stream[F, A] = {
-    val pull = Async[F].fromFuture(F.delay(subscriber.pull()))
     val cancel = F.delay(subscriber.cancel())
+    val pull = Async[F].fromFutureCancelable(F.delay((subscriber.pull(), cancel)))
     Stream.repeatEval(pull).unNoneTerminate.onFinalize(cancel)
   }