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

=act #16653 swallow exception from setTcpNoDelay

Browse source 
* some versions of netcat (`nc -z`) doesn't allow setTcpNoDelay

(cherry picked from commit c4ca93eec652c31f48b7203999dc8b27c3ebc70a)

Conflicts:
	akka-actor/src/main/scala/akka/io/TcpConnection.scala
This commit is contained in:
Patrik Nordwall 2015-01-23 15:12:13 +01:00
parent 73e315f8df
commit 83d75528ee
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
akka-actor/src/main/scala/akka/io/TcpConnection.scala
View file

@ -181,7 +181,12 @@ private[io] abstract class TcpConnection(val tcp: TcpExt, val channel: SocketCha
def completeConnect(registration: ChannelRegistration, commander: ActorRef,
options: immutable.Traversable[SocketOption]): Unit = {
// Turn off Nagle's algorithm by default
channel.socket.setTcpNoDelay(true)
try channel.socket.setTcpNoDelay(true) catch {
case e: SocketException ⇒
// as reported in #16653 some versions of netcat (`nc -z`) doesn't allow setTcpNoDelay
// continue anyway
log.debug("Could not enable TcpNoDelay: {}", e.getMessage)
}
options.foreach(_.afterConnect(channel))
commander ! Connected(