Merge pull request #1548 from spray/wip/io-fix-configured-noacks

io: fix rare bug in TcpConnection causing the sending of certain `NoAck`...
2013-06-20 04:57:10 -07:00 · 2013-06-20 04:57:10 -07:00 · b044b6b5a9
commit b044b6b5a9
parent e976b13566 f2ab463c4d
2 changed files with 23 additions and 9 deletions
--- a/akka-actor/src/main/scala/akka/io/TcpConnection.scala
+++ b/akka-actor/src/main/scala/akka/io/TcpConnection.scala
@ -132,7 +132,7 @@ private[io] abstract class TcpConnection(val tcp: TcpExt, val channel: SocketCha

      } else write match {
        case Write(data, ack) if data.isEmpty ⇒
-          if (ack != NoAck) sender ! ack
+          if (write.wantsAck) sender ! ack

        case _ ⇒
          pendingWrite = createWrite(write)