Polishing #2444

Guard code against potential null elements during concurrent flushing.
redis · Jul 17, 2023 · 14500d6 · 14500d6
1 parent 49f3930
commit 14500d6
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java b/src/main/java/io/lettuce/core/dynamic/SimpleBatcher.java
@@ -153,7 +153,9 @@ private List<RedisCommand<Object, Object, Object>> prepareForceFlush() {
 
             RedisCommand<Object, Object, Object> poll = queue.poll();
 
-            batch.add(poll);
+            if (poll != null) {
+                batch.add(poll);
+            }
         }
 
         return batch;
@@ -167,7 +169,9 @@ private List<RedisCommand<Object, Object, Object>> prepareDefaultFlush(int consu
 
             RedisCommand<Object, Object, Object> poll = queue.poll();
 
-            batch.add(poll);
+            if (poll != null) {
+                batch.add(poll);
+            }
         }
 
         return batch;