NPE in ConnectionWatchdog fixed

8 years ago · af18eb09a3
parent ad2da8d1c1
commit af18eb09a3
1 changed files with 9 additions and 7 deletions
--- a/redisson/src/main/java/org/redisson/client/handler/ConnectionWatchdog.java
+++ b/redisson/src/main/java/org/redisson/client/handler/ConnectionWatchdog.java
@ -65,6 +65,7 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
    @Override
    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
        RedisConnection connection = RedisConnection.getFrom(ctx.channel());
+        if (connection != null) {
            connection.onDisconnect();
            if (!connection.isClosed()) {
                if (connection.isFastReconnect()) {
@ -74,6 +75,7 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
                    reconnect(connection, 1);
                }
            }
+        }
        ctx.fireChannelInactive();
    }