Avoid ClassCastException by inspecting endpoint type when closing Clu…

…sterDistributionChannelWriter #1706
redis · May 10, 2021 · d982772 · d982772
1 parent b0f6f5b
commit d982772
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java b/src/main/java/io/lettuce/core/cluster/ClusterDistributionChannelWriter.java
@@ -28,6 +28,7 @@
 import java.util.stream.IntStream;
 
 import io.lettuce.core.ClientOptions;
+import io.lettuce.core.CommandListenerWriter;
 import io.lettuce.core.ReadFrom;
 import io.lettuce.core.RedisChannelHandler;
 import io.lettuce.core.RedisChannelWriter;
@@ -425,7 +426,16 @@ public CompletableFuture<Void> closeAsync() {
     }
 
     public void disconnectDefaultEndpoint() {
-        ((DefaultEndpoint) defaultWriter).disconnect();
+
+        DefaultEndpoint defaultEndpoint;
+
+        if (defaultWriter instanceof CommandListenerWriter) {
+            defaultEndpoint = (DefaultEndpoint) ((CommandListenerWriter) defaultWriter).getDelegate();
+        } else {
+            defaultEndpoint = ((DefaultEndpoint) defaultWriter);
+        }
+
+        defaultEndpoint.disconnect();
     }
 
     @Override