From 243f6581c6c238e26c413e0e22fe3264ffa330b8 Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Wed, 30 May 2012 04:06:15 -0700 Subject: [PATCH] Safer shutdown --- .../io/netty/channel/socket/oio/OioChildEventLoop.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/transport/src/main/java/io/netty/channel/socket/oio/OioChildEventLoop.java b/transport/src/main/java/io/netty/channel/socket/oio/OioChildEventLoop.java index 0313f0cb2b..81d83d5dc7 100644 --- a/transport/src/main/java/io/netty/channel/socket/oio/OioChildEventLoop.java +++ b/transport/src/main/java/io/netty/channel/socket/oio/OioChildEventLoop.java @@ -53,8 +53,11 @@ class OioChildEventLoop extends SingleThreadEventLoop { } } - if (isShutdown() && peekTask() == null) { - break; + if (isShutdown()) { + ch.unsafe().close(ch.unsafe().voidFuture()); + if (peekTask() == null) { + break; + } } } }