Skip to content

Commit

Permalink
Merge branch 'bug/connection_closed' of github.com:jedesah/rediscala …
Browse files Browse the repository at this point in the history
…into jedesah-bug/connection_closed

Conflicts:
	project/Rediscala.scala
  • Loading branch information
Valerian Barbot committed Oct 15, 2014
2 parents b5f1769 + ec0d293 commit 3aa9400
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/main/scala/redis/actors/RedisWorkerIO.scala
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,10 @@ abstract class RedisWorkerIO(val address: InetSocketAddress) extends Actor with
}
case a: InetSocketAddress => onAddressChanged(a)
case c: ConnectionClosed => {
if(sender == tcpWorker)
if(sender == tcpWorker) {
tcpWorker ! ConfirmedClose // close the sending direction of the connection (TCP FIN)
onConnectionClosed(c)
}
else
onClosingConnectionClosed()
}
Expand Down

0 comments on commit 3aa9400

Please sign in to comment.