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

Merge with master

Browse source
This commit is contained in:
Viktor Klang 2011-03-14 16:29:22 +01:00
commit 0899fa44ab
15 changed files with 83 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -429,7 +429,7 @@ class ActiveRemoteClientHandler(
}
} catch {
case e: Throwable =>
EventHandler notifyListeners EventHandler.Error(e, this)
EventHandler notify EventHandler.Error(e, this)
client.notifyListeners(RemoteClientError(e, client.module, client.remoteAddress))
throw e
}
@ -478,7 +478,7 @@ class ActiveRemoteClientHandler(
.newInstance(exception.getMessage).asInstanceOf[Throwable]
} catch {
case problem: Throwable =>
EventHandler notifyListeners EventHandler.Error(problem, this)
EventHandler notify EventHandler.Error(problem, this)
UnparsableException(classname, exception.getMessage)
}
}
@ -558,7 +558,7 @@ class NettyRemoteServer(serverModule: NettyRemoteServerModule, val host: String,
serverModule.notifyListeners(RemoteServerShutdown(serverModule))
} catch {
case e: Exception =>
EventHandler notifyListeners EventHandler.Error(e, this)
EventHandler notify EventHandler.Error(e, this)
}
}
}
@ -591,7 +591,7 @@ trait NettyRemoteServerModule extends RemoteServerModule { self: RemoteModule =>
}
} catch {
case e: Exception =>
EventHandler notifyListeners EventHandler.Error(e, this)
EventHandler notify EventHandler.Error(e, this)
notifyListeners(RemoteServerError(e, this))
}
this
@ -862,7 +862,7 @@ class RemoteServerHandler(
val actorRef =
try { createActor(actorInfo, channel).start } catch {
case e: SecurityException =>
EventHandler notifyListeners EventHandler.Error(e, this)
EventHandler notify EventHandler.Error(e, this)
write(channel, createErrorReplyMessage(e, request, AkkaActorType.ScalaActor))
server.notifyListeners(RemoteServerError(e, server))
return
@ -981,7 +981,7 @@ class RemoteServerHandler(
write(channel, RemoteEncoder.encode(messageBuilder.build))
} catch {
case e: Exception =>
EventHandler notifyListeners EventHandler.Error(e, this)
EventHandler notify EventHandler.Error(e, this)
server.notifyListeners(RemoteServerError(e, server))
}
@ -997,11 +997,11 @@ class RemoteServerHandler(
}
} catch {
case e: InvocationTargetException =>
EventHandler notifyListeners EventHandler.Error(e, this)
EventHandler notify EventHandler.Error(e, this)
write(channel, createErrorReplyMessage(e.getCause, request, AkkaActorType.TypedActor))
server.notifyListeners(RemoteServerError(e, server))
case e: Exception =>
EventHandler notifyListeners EventHandler.Error(e, this)
EventHandler notify EventHandler.Error(e, this)
write(channel, createErrorReplyMessage(e, request, AkkaActorType.TypedActor))
server.notifyListeners(RemoteServerError(e, server))
}
@ -1061,7 +1061,7 @@ class RemoteServerHandler(
actorRef
} catch {
case e: Throwable =>
EventHandler notifyListeners EventHandler.Error(e, this)
EventHandler notify EventHandler.Error(e, this)
server.notifyListeners(RemoteServerError(e, server))
throw e
}
@ -1128,7 +1128,7 @@ class RemoteServerHandler(
newInstance
} catch {
case e: Throwable =>
EventHandler notifyListeners EventHandler.Error(e, this)
EventHandler notify EventHandler.Error(e, this)
server.notifyListeners(RemoteServerError(e, server))
throw e
}