diff --git a/redisson/src/main/java/org/redisson/connection/pool/ConnectionPool.java b/redisson/src/main/java/org/redisson/connection/pool/ConnectionPool.java index 6f550301050b1c28a2f23aef2aab0cd9d777dc64..fbef06c2c5ff9ebf51361b196eb95b4f80dad6d0 100644 --- a/redisson/src/main/java/org/redisson/connection/pool/ConnectionPool.java +++ b/redisson/src/main/java/org/redisson/connection/pool/ConnectionPool.java @@ -193,7 +193,7 @@ abstract class ConnectionPool { iterator.remove(); } } - while (!entriesCopy.isEmpty()) { + if (!entriesCopy.isEmpty()) { ClientConnectionsEntry entry = config.getLoadBalancer().getEntry(entriesCopy); return acquireConnection(command, entry); } diff --git a/redisson/src/main/java/org/redisson/transaction/BaseTransactionalMap.java b/redisson/src/main/java/org/redisson/transaction/BaseTransactionalMap.java index d777fe28d212133a36c83cd55831c0e02698308a..69ab037c5e2f058c848adf81fd237528ee3492f2 100644 --- a/redisson/src/main/java/org/redisson/transaction/BaseTransactionalMap.java +++ b/redisson/src/main/java/org/redisson/transaction/BaseTransactionalMap.java @@ -177,9 +177,7 @@ public class BaseTransactionalMap { } operations.add(operation); - for (HashValue key : state.keySet()) { - state.put(key, MapEntry.NULL); - } + state.replaceAll((k, v) -> MapEntry.NULL); deleted = true; result.trySuccess(res); }); diff --git a/redisson/src/main/java/org/redisson/transaction/BaseTransactionalSet.java b/redisson/src/main/java/org/redisson/transaction/BaseTransactionalSet.java index 9fc985b96d41bab2c0abd14a09b78fede789f5ea..07ac1555670a7c0f7bdf1a6a78f8d7bd3ac986dd 100644 --- a/redisson/src/main/java/org/redisson/transaction/BaseTransactionalSet.java +++ b/redisson/src/main/java/org/redisson/transaction/BaseTransactionalSet.java @@ -147,9 +147,7 @@ public abstract class BaseTransactionalSet extends BaseTransactionalObject { } operations.add(operation); - for (HashValue key : state.keySet()) { - state.put(key, NULL); - } + state.replaceAll((k, v) -> NULL); deleted = true; result.trySuccess(res); });