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

Fixing a logic error inte the ActiveRemoteClient

Browse source
This commit is contained in:
Viktor Klang 2012-01-09 13:50:54 +01:00
parent 1c6761c811
commit 07b27ba3de
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -162,15 +162,9 @@ class ActiveRemoteClient private[akka] (
connection.getChannel.write(remoteSupport.createControlEnvelope(handshake.build))
}
def closeChannel(connection: ChannelFuture) = {
val channel = connection.getChannel
openChannels.remove(channel)
channel.close()
}
def attemptReconnect(): Boolean = {
log.debug("Remote client reconnecting to [{}]", remoteAddress)
val connection = bootstrap.connect(new InetSocketAddress(remoteAddress.ip.get, remoteAddress.port))
connection = bootstrap.connect(new InetSocketAddress(remoteAddress.ip.get, remoteAddress.port))
openChannels.add(connection.awaitUninterruptibly.getChannel) // Wait until the connection attempt succeeds or fails.
if (!connection.isSuccess) {
@ -210,7 +204,8 @@ class ActiveRemoteClient private[akka] (
} match {
case true ⇒ true
case false if reconnectIfAlreadyConnected ⇒
closeChannel(connection)
openChannels.remove(connection.getChannel)
connection.getChannel.close()
log.debug("Remote client reconnecting to [{}]", remoteAddress)
attemptReconnect()