aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSeth Tisue <seth@tisue.net>2018-03-14 08:16:18 -0700
committerGitHub <noreply@github.com>2018-03-14 08:16:18 -0700
commite7f89483f686d2232cd8e58248d42e529fb7b9a6 (patch)
tree2407ed21ed6ace8ae9658d90bdcc91a91da97b3e /src
parent7d5ebe62336ab99a5988d4ef472fd486ec6cbe49 (diff)
parent1a7972ff87d6bd0ab30cc2a98cdd8f94cb9239f9 (diff)
downloadscala-async-e7f89483f686d2232cd8e58248d42e529fb7b9a6.tar.gz
scala-async-e7f89483f686d2232cd8e58248d42e529fb7b9a6.tar.bz2
scala-async-e7f89483f686d2232cd8e58248d42e529fb7b9a6.zip
Merge pull request #192 from NthPortal/forkjoin-fix
Remove use of scala.concurrent.forkjoin
Diffstat (limited to 'src')
-rw-r--r--src/test/scala/scala/async/run/futures/FutureSpec.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/scala/scala/async/run/futures/FutureSpec.scala b/src/test/scala/scala/async/run/futures/FutureSpec.scala
index 3f3f726..eb57ff5 100644
--- a/src/test/scala/scala/async/run/futures/FutureSpec.scala
+++ b/src/test/scala/scala/async/run/futures/FutureSpec.scala
@@ -35,7 +35,7 @@ class FutureSpec {
@Test def `A future with custom ExecutionContext should handle Throwables`() {
val ms = new mutable.HashSet[Throwable] with mutable.SynchronizedSet[Throwable]
- implicit val ec = scala.concurrent.ExecutionContext.fromExecutor(new scala.concurrent.forkjoin.ForkJoinPool(), {
+ implicit val ec = scala.concurrent.ExecutionContext.fromExecutor(new java.util.concurrent.ForkJoinPool(), {
t =>
ms += t
})