diff --git a/akka-actor/src/main/scala/akka/actor/IO.scala b/akka-actor/src/main/scala/akka/actor/IO.scala index 42a76de242..a90dd6f579 100644 --- a/akka-actor/src/main/scala/akka/actor/IO.scala +++ b/akka-actor/src/main/scala/akka/actor/IO.scala @@ -954,24 +954,15 @@ final class IOManagerActor extends Actor with ActorLogging { private def setSocketOptions(socket: java.net.Socket, options: Seq[IO.SocketOption]) { options foreach { - case IO.KeepAlive(on) ⇒ - forwardFailure(socket.setKeepAlive(on)) - case IO.OOBInline(on) ⇒ - forwardFailure(socket.setOOBInline(on)) - case IO.ReceiveBufferSize(size) ⇒ - forwardFailure(socket.setReceiveBufferSize(size)) - case IO.ReuseAddress(on) ⇒ - forwardFailure(socket.setReuseAddress(on)) - case IO.SendBufferSize(size) ⇒ - forwardFailure(socket.setSendBufferSize(size)) - case IO.SoLinger(linger) ⇒ - forwardFailure(socket.setSoLinger(linger.isDefined, math.max(0, linger.getOrElse(socket.getSoLinger)))) - case IO.SoTimeout(timeout) ⇒ - forwardFailure(socket.setSoTimeout(timeout.toMillis.toInt)) - case IO.TcpNoDelay(on) ⇒ - forwardFailure(socket.setTcpNoDelay(on)) - case IO.TrafficClass(tc) ⇒ - forwardFailure(socket.setTrafficClass(tc)) + case IO.KeepAlive(on) ⇒ forwardFailure(socket.setKeepAlive(on)) + case IO.OOBInline(on) ⇒ forwardFailure(socket.setOOBInline(on)) + case IO.ReceiveBufferSize(size) ⇒ forwardFailure(socket.setReceiveBufferSize(size)) + case IO.ReuseAddress(on) ⇒ forwardFailure(socket.setReuseAddress(on)) + case IO.SendBufferSize(size) ⇒ forwardFailure(socket.setSendBufferSize(size)) + case IO.SoLinger(linger) ⇒ forwardFailure(socket.setSoLinger(linger.isDefined, math.max(0, linger.getOrElse(socket.getSoLinger)))) + case IO.SoTimeout(timeout) ⇒ forwardFailure(socket.setSoTimeout(timeout.toMillis.toInt)) + case IO.TcpNoDelay(on) ⇒ forwardFailure(socket.setTcpNoDelay(on)) + case IO.TrafficClass(tc) ⇒ forwardFailure(socket.setTrafficClass(tc)) case IO.PerformancePreferences(connTime, latency, bandwidth) ⇒ forwardFailure(socket.setPerformancePreferences(connTime, latency, bandwidth)) } @@ -989,10 +980,8 @@ final class IOManagerActor extends Actor with ActorLogging { val sock = channel.socket options foreach { - case IO.ReceiveBufferSize(size) ⇒ - forwardFailure(sock.setReceiveBufferSize(size)) - case IO.ReuseAddress(on) ⇒ - forwardFailure(sock.setReuseAddress(on)) + case IO.ReceiveBufferSize(size) ⇒ forwardFailure(sock.setReceiveBufferSize(size)) + case IO.ReuseAddress(on) ⇒ forwardFailure(sock.setReuseAddress(on)) case IO.PerformancePreferences(connTime, latency, bandwidth) ⇒ forwardFailure(sock.setPerformancePreferences(connTime, latency, bandwidth)) }