From e0c0171e08e4bd4f2c136a31cc9d5063f0c7977d Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Mon, 20 Jun 2022 12:19:18 +0300 Subject: [PATCH] refactoring --- redisson/src/main/java/org/redisson/RedissonLock.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/redisson/src/main/java/org/redisson/RedissonLock.java b/redisson/src/main/java/org/redisson/RedissonLock.java index 8ff84ea46..e3e90fdf0 100644 --- a/redisson/src/main/java/org/redisson/RedissonLock.java +++ b/redisson/src/main/java/org/redisson/RedissonLock.java @@ -231,7 +231,7 @@ public class RedissonLock extends RedissonBaseLock { CompletableFuture subscribeFuture = subscribe(threadId); try { subscribeFuture.get(time, TimeUnit.MILLISECONDS); - } catch (ExecutionException | TimeoutException e) { + } catch (TimeoutException e) { if (!subscribeFuture.cancel(false)) { subscribeFuture.whenComplete((res, ex) -> { if (ex == null) { @@ -241,6 +241,9 @@ public class RedissonLock extends RedissonBaseLock { } acquireFailed(waitTime, unit, threadId); return false; + } catch (ExecutionException e) { + acquireFailed(waitTime, unit, threadId); + return false; } try {