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

renamed api-java to fun-test-java + upgrade guiceyfruit to 2.0

Browse source
This commit is contained in:
Jonas Boner 2009-05-25 15:52:45 +02:00
parent 8c11f04262
commit 9235b0e221
40 changed files with 363 additions and 630 deletions
Download patch file Download diff file Expand all files Collapse all files

18
kernel/src/main/scala/ActiveObject.scala
View file

@ -143,7 +143,7 @@ sealed class TransactionalAroundAdvice(target: Class[_],
activeTx = None
}
private def handleResult(result: ErrRef[AnyRef]): AnyRef = {
private def handleResult(result: ResultOrFailure[AnyRef]): AnyRef = {
try {
result()
} catch {
@ -162,11 +162,11 @@ sealed class TransactionalAroundAdvice(target: Class[_],
private def sendOneWay(joinpoint: JoinPoint) = server ! Invocation(joinpoint, activeTx)
private def sendAndReceiveEventually(joinpoint: JoinPoint): ErrRef[AnyRef] = {
private def sendAndReceiveEventually(joinpoint: JoinPoint): ResultOrFailure[AnyRef] = {
server !!! (Invocation(joinpoint, activeTx), {
var ref = ErrRef(activeTx)
ref() = throw new ActiveObjectInvocationTimeoutException("Invocation to active object [" + targetInstance.getClass.getName + "] timed out after " + server.timeout + " milliseconds")
ref
var resultOrFailure = ResultOrFailure(activeTx)
resultOrFailure() = throw new ActiveObjectInvocationTimeoutException("Invocation to active object [" + targetInstance.getClass.getName + "] timed out after " + server.timeout + " milliseconds")
resultOrFailure
})
}
@ -216,13 +216,15 @@ sealed class TransactionalAroundAdvice(target: Class[_],
private[kernel] class Dispatcher(val targetName: String) extends GenericServer {
override def body: PartialFunction[Any, Unit] = {
case (tx: Option[Transaction], joinpoint: JoinPoint) =>
case Invocation(joinpoint: JoinPoint, tx: Option[Transaction]) =>
ActiveObject.threadBoundTx.set(tx)
try {
reply(ErrRef(joinpoint.proceed, tx))
reply(ResultOrFailure(joinpoint.proceed, tx))
} catch {
case e =>
val ref = ErrRef(tx); ref() = throw e; reply(ref)
val resultOrFailure = ResultOrFailure(tx)
resultOrFailure() = throw e
reply(resultOrFailure)
}
case 'exit =>