1 files changed, 17 insertions, 1 deletions
diff --git a/src/library/scala/concurrent/impl/ExecutionContextImpl.scala b/src/library/scala/concurrent/impl/ExecutionContextImpl.scala
index d15a9b828b..c308a59297 100644
--- a/src/library/scala/concurrent/impl/ExecutionContextImpl.scala
+++ b/src/library/scala/concurrent/impl/ExecutionContextImpl.scala
@@ -73,7 +73,23 @@ private[scala] class ExecutionContextImpl(es: AnyRef) extends ExecutionContext w
   def internalBlockingCall[T](awaitable: Awaitable[T], atMost: Duration): T = {
     Future.releaseStack(this)
     
-    awaitable.result(atMost)(scala.concurrent.Await.canAwaitEvidence)
+    executorService match {
+      case fj: ForkJoinPool =>
+        var result: T = null.asInstanceOf[T]
+        val managedBlocker = new ForkJoinPool.ManagedBlocker {
+          @volatile var isdone = false
+          def block() = {
+            result = awaitable.result(atMost)(scala.concurrent.Await.canAwaitEvidence)
+            isdone = true
+            true
+          }
+          def isReleasable = isdone
+        }
+        ForkJoinPool.managedBlock(managedBlocker)
+        result
+      case _ =>
+        awaitable.result(atMost)(scala.concurrent.Await.canAwaitEvidence)
+    }
   }
 
   def reportFailure(t: Throwable) = t match {