honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-24 13:55:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential NPEin Netty4Transport.stopInternal (#56080) (#56129)

Browse Source 
Closes #56068
This commit is contained in:
Armin Braun 2020-05-04 19:38:21 +02:00 committed by GitHub
parent b816ab0c18
commit 75d4a4def4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Transport.java
View File

@ -307,15 +307,14 @@ public class Netty4Transport extends TcpTransport {
@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> {