Skip to content

Commit 7d14699

Browse files
committed
Use s.c.blocking in future.toJava.get
As suggested by Viktor.
1 parent 942a582 commit 7d14699

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

src/main/scala/scala/concurrent/java8/FutureConvertersImpl.scala

+5-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package scala.concurrent.java8
66
// Located in this package to access private[concurrent] members
77

88
import scala.concurrent.{ Future, Promise, ExecutionContext, ExecutionContextExecutorService, ExecutionContextExecutor, impl }
9-
import java.util.concurrent.{ CompletionStage, Executor, ExecutorService, CompletableFuture }
9+
import java.util.concurrent._
1010
import scala.util.{ Try, Success, Failure }
1111
import java.util.function.{ BiConsumer, Function JF, Consumer, BiFunction }
1212

@@ -76,6 +76,10 @@ object FuturesConvertersImpl {
7676
this
7777
}
7878

79+
override def get(): T = scala.concurrent.blocking(super.get())
80+
81+
override def get(timeout: Long, unit: TimeUnit): T = scala.concurrent.blocking(super.get(timeout, unit))
82+
7983
override def toString: String = super[CompletableFuture].toString
8084
}
8185

0 commit comments

Comments
 (0)