Fix potential NPEin Netty4Transport.stopInternal (#56080)

Closes #56069
elastic · May 4, 2020 · b3f4835 · b3f4835
1 parent 134c0e8
commit b3f4835
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/...es/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Transport.java b/...es/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Transport.java
@@ -307,15 +307,14 @@ protected Netty4TcpServerChannel bind(String name, InetSocketAddress address) {
     @SuppressForbidden(reason = "debug")
     protected void stopInternal() {
         Releasables.close(() -> {
-            Future<?> shutdownFuture = eventLoopGroup.shutdownGracefully(0, 5, TimeUnit.SECONDS);
-            shutdownFuture.awaitUninterruptibly();
-            if (shutdownFuture.isSuccess() == false) {
-                logger.warn("Error closing netty event loop group", shutdownFuture.cause());
+            if (eventLoopGroup != null) {
+                Future<?> shutdownFuture = eventLoopGroup.shutdownGracefully(0, 5, TimeUnit.SECONDS);
+                shutdownFuture.awaitUninterruptibly();
+                if (shutdownFuture.isSuccess() == false) {
+                    logger.warn("Error closing netty event loop group", shutdownFuture.cause());
+                }
             }
-
-            serverBootstraps.clear();
-            clientBootstrap = null;
-        });
+        }, serverBootstraps::clear, () -> clientBootstrap = null);
     }
 
     protected class ClientChannelInitializer extends ChannelInitializer<Channel> {