From 3dba1ef8ddcce3b2de69d3ab5eaa3f2356b3c1b7 Mon Sep 17 00:00:00 2001
From: Jakob Buchgraber <jakob.buchgraber@tum.de>
Date: Tue, 9 Sep 2014 22:17:12 +0200
Subject: [PATCH] Add missing calls to childGroup().shutdownGraceFully()

Motivation:

The ServerBootrap's child group would not be shutdown.

Modification:

Add missing shutdownGracefully() call.

Result:

The child group is shutdown correctly.
---
 .../codec/http2/DelegatingHttp2HttpConnectionHandlerTest.java    | 1 +
 .../netty/handler/codec/http2/Http2ConnectionRoundtripTest.java  | 1 +
 .../io/netty/handler/codec/http2/Http2FrameRoundtripTest.java    | 1 +
 .../netty/handler/codec/http2/InboundHttp2ToHttpAdapterTest.java | 1 +
 .../src/test/java/io/netty/handler/ssl/JettySslEngineTest.java   | 1 +
 5 files changed, 5 insertions(+)

diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/DelegatingHttp2HttpConnectionHandlerTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/DelegatingHttp2HttpConnectionHandlerTest.java
index d34efe28e2..9ecafe3fd6 100644
--- a/codec-http2/src/test/java/io/netty/handler/codec/http2/DelegatingHttp2HttpConnectionHandlerTest.java
+++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/DelegatingHttp2HttpConnectionHandlerTest.java
@@ -117,6 +117,7 @@ public class DelegatingHttp2HttpConnectionHandlerTest {
     public void teardown() throws Exception {
         serverChannel.close().sync();
         sb.group().shutdownGracefully();
+        sb.childGroup().shutdownGracefully();
         cb.group().shutdownGracefully();
     }
 
diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ConnectionRoundtripTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ConnectionRoundtripTest.java
index ff3cfc43ab..cd4f71f093 100644
--- a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ConnectionRoundtripTest.java
+++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2ConnectionRoundtripTest.java
@@ -120,6 +120,7 @@ public class Http2ConnectionRoundtripTest {
     public void teardown() throws Exception {
         serverChannel.close().sync();
         sb.group().shutdownGracefully();
+        sb.childGroup().shutdownGracefully();
         cb.group().shutdownGracefully();
     }
 
diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2FrameRoundtripTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2FrameRoundtripTest.java
index 2f07c915bd..3e333c1921 100644
--- a/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2FrameRoundtripTest.java
+++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/Http2FrameRoundtripTest.java
@@ -109,6 +109,7 @@ public class Http2FrameRoundtripTest {
     public void teardown() throws Exception {
         serverChannel.close().sync();
         sb.group().shutdownGracefully();
+        sb.childGroup().shutdownGracefully();
         cb.group().shutdownGracefully();
     }
 
diff --git a/codec-http2/src/test/java/io/netty/handler/codec/http2/InboundHttp2ToHttpAdapterTest.java b/codec-http2/src/test/java/io/netty/handler/codec/http2/InboundHttp2ToHttpAdapterTest.java
index c5a165c1c8..ac5eec9951 100644
--- a/codec-http2/src/test/java/io/netty/handler/codec/http2/InboundHttp2ToHttpAdapterTest.java
+++ b/codec-http2/src/test/java/io/netty/handler/codec/http2/InboundHttp2ToHttpAdapterTest.java
@@ -144,6 +144,7 @@ public class InboundHttp2ToHttpAdapterTest {
     public void teardown() throws Exception {
         serverChannel.close().sync();
         sb.group().shutdownGracefully();
+        sb.childGroup().shutdownGracefully();
         cb.group().shutdownGracefully();
         clientDelegator = null;
         serverDelegator = null;
diff --git a/handler/src/test/java/io/netty/handler/ssl/JettySslEngineTest.java b/handler/src/test/java/io/netty/handler/ssl/JettySslEngineTest.java
index 9e92bd1116..0bbbd90291 100644
--- a/handler/src/test/java/io/netty/handler/ssl/JettySslEngineTest.java
+++ b/handler/src/test/java/io/netty/handler/ssl/JettySslEngineTest.java
@@ -103,6 +103,7 @@ public class JettySslEngineTest {
         if (serverChannel != null) {
             serverChannel.close().sync();
             sb.group().shutdownGracefully();
+            sb.childGroup().shutdownGracefully();
             cb.group().shutdownGracefully();
         }
         clientChannel = null;