raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Bumpting to Scala 2.10.0-SNAPSHOT

Browse source
This commit is contained in:
Viktor Klang 2012-07-20 16:01:18 +02:00
parent 6e134ede21
commit 5a81ac3ba5
3 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-actor/src/main/scala/akka/dispatch/ThreadPoolBuilder.scala
View file

@ -5,7 +5,7 @@
package akka.dispatch
import java.util.Collection
import scala.concurrent.{ Awaitable, BlockContext }
import scala.concurrent.{ Awaitable, BlockContext, CanAwait }
import scala.concurrent.util.Duration
import scala.concurrent.forkjoin._
import java.util.concurrent.{
@ -159,13 +159,11 @@ object MonitorableThreadFactory {
new Thread.UncaughtExceptionHandler() { def uncaughtException(thread: Thread, cause: Throwable) = () }
private[akka] class AkkaForkJoinWorkerThread(_pool: ForkJoinPool) extends ForkJoinWorkerThread(_pool) with BlockContext {
override def internalBlockingCall[T](awaitable: Awaitable[T], atMost: Duration): T = {
override def blockOn[T](thunk: ⇒ T)(implicit permission: CanAwait): T = {
val result = new AtomicReference[Option[T]](None)
ForkJoinPool.managedBlock(new ForkJoinPool.ManagedBlocker {
def block(): Boolean = {
result.set(Some(awaitable.result(atMost)(scala.concurrent.impl.InternalFutureUtil.canAwaitEvidence)))
// FIXME replace with
//result.set(Some(BlockContext.DefaultBlockContext.internalBlockingCall(awaitable, atMost)))
result.set(Some(thunk))
true
}
def isReleasable = result.get.isDefined