diff --git a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/DefaultRedisCacheWriter.java b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/DefaultRedisCacheWriter.java index 958042c5b..4a28c8f80 100644 --- a/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/DefaultRedisCacheWriter.java +++ b/pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/cache/DefaultRedisCacheWriter.java @@ -32,6 +32,7 @@ import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.Collections; import java.util.Optional; +import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import java.util.function.Function; @@ -123,7 +124,7 @@ class DefaultRedisCacheWriter implements RedisCacheWriter { } try { - if (connection.setNX(key, value)) { + if (Boolean.TRUE.equals(connection.setNX(key, value))) { if (shouldExpireWithin(ttl)) { connection.pExpire(key, ttl.toMillis()); @@ -247,27 +248,16 @@ class DefaultRedisCacheWriter implements RedisCacheWriter { private T execute(String name, Function callback) { - RedisConnection connection = connectionFactory.getConnection(); - try { - + try (RedisConnection connection = connectionFactory.getConnection()) { checkAndPotentiallyWaitUntilUnlocked(name, connection); return callback.apply(connection); } - finally { - connection.close(); - } } private void executeLockFree(Consumer callback) { - - RedisConnection connection = connectionFactory.getConnection(); - - try { + try (RedisConnection connection = connectionFactory.getConnection()) { callback.accept(connection); } - finally { - connection.close(); - } } private void checkAndPotentiallyWaitUntilUnlocked(String name, RedisConnection connection) { @@ -277,7 +267,6 @@ class DefaultRedisCacheWriter implements RedisCacheWriter { } try { - while (doCheckLock(name, connection)) { Thread.sleep(sleepTime.toMillis()); } diff --git a/pom.xml b/pom.xml index c2db7ffe7..6bb7208a5 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ - 2.6.9 + 2.6.10 2021.0.3 2021.0.1.0 UTF-8