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

All tests pass, might actually have solved the typed actor method resolution issue

Browse source
This commit is contained in:
Viktor Klang 2011-03-14 14:17:54 +01:00
parent cce0fa8b8f
commit 2a390d3fcb
3 changed files with 45 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

35
akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
View file

@ -924,10 +924,41 @@ class RemoteServerHandler(
val typedActorInfo = actorInfo.getTypedActorInfo
val typedActor = createTypedActor(actorInfo, channel)
val (argClasses, args) = MessageSerializer.deserialize(request.getMessage).asInstanceOf[Tuple2[Array[Class[_]],Array[AnyRef]]]
//FIXME: Add ownerTypeHint and parameter types to the TypedActorInfo?
val (ownerTypeHint, argClasses, args) = MessageSerializer.deserialize(request.getMessage).asInstanceOf[Tuple3[String,Array[Class[_]],Array[AnyRef]]]
def resolveMethod(bottomType: Class[_], typeHint: String, methodName: String, methodSignature: Array[Class[_]]): java.lang.reflect.Method = {
var typeToResolve = bottomType
var targetMethod: java.lang.reflect.Method = null
var firstException: NoSuchMethodException = null
while((typeToResolve ne null) && (targetMethod eq null)) {
if ((typeHint eq null) || typeToResolve.getName.startsWith(typeHint)) {
try {
targetMethod = typeToResolve.getDeclaredMethod(methodName, methodSignature:_*)
targetMethod.setAccessible(true)
} catch {
case e: NoSuchMethodException =>
if (firstException eq null)
firstException = e
}
}
typeToResolve = typeToResolve.getSuperclass
}
if((targetMethod eq null) && (firstException ne null))
throw firstException
targetMethod
}
try {
val messageReceiver = ReflectiveAccess.resolveMethod(typedActor.getClass, typedActorInfo.getMethod, argClasses)
println("%s(%s) = %s for %s" format(ownerTypeHint, argClasses.map(_.getName).mkString(", "), args.mkString(", "), typedActor.getClass.getName))
val messageReceiver = resolveMethod(typedActor.getClass, ownerTypeHint, typedActorInfo.getMethod, argClasses)
if (request.getOneWay) messageReceiver.invoke(typedActor, args: _*)
else {