Merge pull request #10615 from lrytz/t12918

Avoid completableFuture.asScala crash for MinimalStage
scala · Dec 20, 2023 · 85fa13d · 85fa13d
2 parents eeccf19 + 1423552
commit 85fa13d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/library/scala/jdk/javaapi/FutureConverters.scala b/src/library/scala/jdk/javaapi/FutureConverters.scala
@@ -70,13 +70,19 @@ object FutureConverters {
       case cf: CF[T] => cf.wrapped
       // in theory not safe (could be `class C extends Future[A] with CompletionStage[B]`):
       case f: Future[T @unchecked] => f
-      case cf: CompletableFuture[T @unchecked] if cf.isDone && !cf.isCompletedExceptionally =>
-        val p = new P[T](cs)
-        p.tryComplete(Success(cf.join()))
-        p.future
       case _ =>
         val p = new P[T](cs)
-        cs.handle(p)
+        val completedCF = cs match {
+          case cf0: CompletableFuture[T @unchecked] =>
+            // drop `MinimalStage` (scala/bug#12918)
+            val cf = cf0.toCompletableFuture
+            if (cf.isDone && !cf.isCompletedExceptionally) cf else null
+          case _ => null
+        }
+        if (completedCF != null)
+          p.tryComplete(Success(completedCF.join()))
+        else
+          cs.handle(p)
         p.future
     }
   }

diff --git a/test/files/run/t12918.scala b/test/files/run/t12918.scala
@@ -0,0 +1,9 @@
+// javaVersion: 9+
+
+import java.util.concurrent._
+import scala.jdk.FutureConverters._
+
+object Test extends App {
+  val cf = CompletableFuture.completedStage("42")
+  assert("42" == cf.asScala.value.get.get)
+}