From 799ab8b482c9bc3748efa87bf5ddc905d54ec859 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Mon, 30 Jan 2012 20:38:40 +0100 Subject: [PATCH] Fixed import clash when using java7, fj in java.util.concurrent._. See #1728 --- .../scala/akka/dispatch/ThreadPoolBuilder.scala | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala b/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala index 4612fdca1f..5be5f1b0e1 100644 --- a/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala +++ b/akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala @@ -5,10 +5,20 @@ package akka.dispatch import java.util.Collection -import java.util.concurrent.atomic.AtomicLong import akka.util.Duration -import java.util.concurrent._ import akka.jsr166y._ +import java.util.concurrent.atomic.AtomicLong +import java.util.concurrent.ArrayBlockingQueue +import java.util.concurrent.BlockingQueue +import java.util.concurrent.Callable +import java.util.concurrent.ExecutorService +import java.util.concurrent.LinkedBlockingQueue +import java.util.concurrent.RejectedExecutionHandler +import java.util.concurrent.RejectedExecutionException +import java.util.concurrent.SynchronousQueue +import java.util.concurrent.TimeUnit +import java.util.concurrent.ThreadFactory +import java.util.concurrent.ThreadPoolExecutor object ThreadPoolConfig { type QueueFactory = () ⇒ BlockingQueue[Runnable]