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

changed package imports for supervisor

Browse source
This commit is contained in:
Jonas Boner 2009-03-10 00:56:42 +01:00
parent 7133c42c00
commit 23c104003b
11 changed files with 182 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,7 +4,7 @@
package com.scalablesolutions.akka.kernel
import scala.actors.behavior._
import com.scalablesolutions.akka.supervisor._
import java.util.{List => JList, ArrayList}
@ -24,7 +24,6 @@ class ActiveObjectFactory {
ActiveObject.supervise(restartStrategy, components.toArray.toList.asInstanceOf[List[Worker]])
}
/**
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/
@ -48,7 +47,7 @@ object ActiveObject {
override def getSupervisorConfig = SupervisorConfig(restartStrategy, components)
}
val supervisor = factory.newSupervisor
supervisor ! scala.actors.behavior.Start
supervisor ! com.scalablesolutions.akka.supervisor.Start
supervisor
}
@ -65,7 +64,7 @@ object ActiveObject {
* @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
*/
class ActiveObjectProxy(val intf: Class[_], val target: Class[_], val timeout: Int) extends InvocationHandler {
private val oneway = classOf[scala.actors.annotation.oneway]
private val oneway = classOf[com.scalablesolutions.akka.annotation.oneway]
private var targetInstance: AnyRef = _
private[akka] def setTargetInstance(instance: AnyRef) = targetInstance = instance
@ -73,7 +72,6 @@ class ActiveObjectProxy(val intf: Class[_], val target: Class[_], val timeout: I
override def body: PartialFunction[Any, Unit] = {
case invocation: Invocation =>
try {
println("==========> " + invocation)
reply(ErrRef(invocation.invoke))
} catch {
case e: InvocationTargetException =>
@ -133,7 +131,10 @@ case class Invocation(val method: Method, val args: Array[Object], val target: A
private def isEqual(a1: Array[Object], a2: Array[Object]): Boolean =
(a1 == null && a2 == null) ||
(a1 != null && a2 != null && a1.size == a2.size && a1.zip(a2).find(t => t._1 == t._2).isDefined)
(a1 != null &&
a2 != null &&
a1.size == a2.size &&
a1.zip(a2).find(t => t._1 == t._2).isDefined)
private def argsToString(array: Array[Object]): String = array.foldLeft("(")(_ + " " + _) + ")"
private def argsToString(array: Array[Object]): String = synchronized { array.foldLeft("(")(_ + " " + _) + ")" }
}