From a53848edfadd55aa517084e43ca97e70c29944f5 Mon Sep 17 00:00:00 2001 From: Johannes Rudolph Date: Tue, 22 Jan 2013 11:41:40 +0100 Subject: [PATCH] properly cleanup selector in tests --- akka-io/src/test/scala/akka/io/TcpConnectionSpec.scala | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/akka-io/src/test/scala/akka/io/TcpConnectionSpec.scala b/akka-io/src/test/scala/akka/io/TcpConnectionSpec.scala index 30124926b2..659add2f83 100644 --- a/akka-io/src/test/scala/akka/io/TcpConnectionSpec.scala +++ b/akka-io/src/test/scala/akka/io/TcpConnectionSpec.scala @@ -390,6 +390,8 @@ class TcpConnectionSpec extends AkkaSpec("akka.io.tcp.register-timeout = 500ms") if (nioSelector.selectedKeys().contains(serverSelectionKey)) tryReading() else 0 + nioSelector.selectedKeys().clear() + pullFromServerSide(remaining - read, remainingTries - 1) } @@ -397,7 +399,9 @@ class TcpConnectionSpec extends AkkaSpec("akka.io.tcp.register-timeout = 500ms") buffer.clear() val read = serverSideChannel.read(buffer) - if (read == -1) + if (read == 0) + throw new IllegalStateException("Made no progress") + else if (read == -1) throw new IllegalStateException("Connection was closed unexpectedly with remaining bytes " + remaining) else read }