From 39b57b889cf77f38b25f45bd38fad58d22a4bb73 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Mon, 8 Jul 2013 13:36:39 +0200 Subject: [PATCH] [#1539] Fix bug in DefaultChannelGroup.close() which was blocking the close() call on ServerChannel --- .../main/java/io/netty/channel/group/DefaultChannelGroup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java b/transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java index d211d6d985..09c7cf6cc9 100644 --- a/transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java +++ b/transport/src/main/java/io/netty/channel/group/DefaultChannelGroup.java @@ -186,7 +186,7 @@ public class DefaultChannelGroup extends AbstractSet implements Channel new LinkedHashMap(size()); for (Channel c: serverChannels.values()) { - futures.put(c.id(), c.close().awaitUninterruptibly()); + futures.put(c.id(), c.close()); } for (Channel c: nonServerChannels.values()) { futures.put(c.id(), c.close());