Fix for #916

From commit: 59d81c0 Fixing ticket #916, adding a catch-all logger for exceptions around message processing
akka · Jun 26, 2011 · d7b5ee2 · d7b5ee2
1 parent ed94159
commit d7b5ee2
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala b/akka-remote/src/main/scala/akka/remote/netty/NettyRemoteSupport.scala
@@ -960,13 +960,17 @@ class RemoteServerHandler(
       case _                       ⇒ None
     }
 
-  private def handleRemoteMessageProtocol(request: RemoteMessageProtocol, channel: Channel) = {
+  private def handleRemoteMessageProtocol(request: RemoteMessageProtocol, channel: Channel) = try {
     request.getActorInfo.getActorType match {
       case SCALA_ACTOR ⇒ dispatchToActor(request, channel)
       case TYPED_ACTOR ⇒ dispatchToTypedActor(request, channel)
       case JAVA_ACTOR  ⇒ throw new IllegalActorStateException("ActorType JAVA_ACTOR is currently not supported")
       case other       ⇒ throw new IllegalActorStateException("Unknown ActorType [" + other + "]")
     }
+  } catch {
+    case e: Exception ⇒
+      server.notifyListeners(RemoteServerError(e, server))
+      EventHandler.error(e, this, e.getMessage)
   }
 
   private def dispatchToActor(request: RemoteMessageProtocol, channel: Channel) {