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

#20282: Make unbind work on windows

Browse source
This commit is contained in:
Endre Sándor Varga 2016-04-11 11:53:59 +02:00
parent 81579bd403
commit 028440d825
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-actor/src/main/scala/akka/io/TcpListener.scala
View file

@ -4,14 +4,16 @@
package akka.io
import java.nio.channels.{ SocketChannel, SelectionKey, ServerSocketChannel }
import java.nio.channels.{ SelectionKey, ServerSocketChannel, SocketChannel }
import java.net.InetSocketAddress
import scala.annotation.tailrec
import scala.util.control.NonFatal
import akka.actor._
import akka.io.SelectionHandler._
import akka.io.Tcp._
import akka.dispatch.{ UnboundedMessageQueueSemantics, RequiresMessageQueue }
import akka.dispatch.{ RequiresMessageQueue, UnboundedMessageQueueSemantics }
import akka.util.Helpers
/**
* INTERNAL API
@ -96,6 +98,8 @@ private[io] class TcpListener(selectorRouter: ActorRef,
case Unbind ⇒
log.debug("Unbinding endpoint {}", localAddress)
channel.close()
// see https://github.com/akka/akka/issues/20282
if (Helpers.isWindows) registration.enableInterest(1)
sender() ! Unbound
log.debug("Unbound endpoint {}, stopping listener", localAddress)
context.stop(self)

4
akka-stream-tests/src/test/scala/akka/stream/io/TcpSpec.scala
View file

@ -459,10 +459,6 @@ class TcpSpec extends AkkaSpec("akka.stream.materializer.subscription-timeout.ti
}
"bind and unbind correctly" in EventFilter[BindException](occurrences = 2).intercept {
if (Helpers.isWindows) {
info("On Windows unbinding is not immediate")
pending
}
val address = temporaryServerAddress()
val probe1 = TestSubscriber.manualProbe[Tcp.IncomingConnection]()
val bind = Tcp(system).bind(address.getHostName, address.getPort) // TODO getHostString in Java7