diff --git a/redisson/src/main/java/org/redisson/client/RedisClient.java b/redisson/src/main/java/org/redisson/client/RedisClient.java index 5cdfbd0ae..e4e4c83d1 100644 --- a/redisson/src/main/java/org/redisson/client/RedisClient.java +++ b/redisson/src/main/java/org/redisson/client/RedisClient.java @@ -203,7 +203,10 @@ public class RedisClient { public ChannelGroupFuture shutdownAsync() { for (Channel channel : channels) { - RedisConnection.getFrom(channel).setClosed(true); + RedisConnection connection = RedisConnection.getFrom(channel); + if (connection != null) { + connection.setClosed(true); + } } return channels.close(); }