From b93cba087b80fea1c164a91e36ec6858d4234384 Mon Sep 17 00:00:00 2001 From: Nikita Date: Mon, 7 Aug 2017 13:48:20 +0300 Subject: [PATCH] refactoring --- .../main/java/org/redisson/RedissonMultiLock.java | 11 ----------- .../main/java/org/redisson/RedissonRedLock.java | 14 -------------- 2 files changed, 25 deletions(-) diff --git a/redisson/src/main/java/org/redisson/RedissonMultiLock.java b/redisson/src/main/java/org/redisson/RedissonMultiLock.java index c5007e988..32b980ab2 100644 --- a/redisson/src/main/java/org/redisson/RedissonMultiLock.java +++ b/redisson/src/main/java/org/redisson/RedissonMultiLock.java @@ -20,16 +20,13 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.ListIterator; -import java.util.Queue; import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import org.redisson.api.RFuture; import org.redisson.api.RLock; -import io.netty.util.concurrent.Future; import io.netty.util.internal.ThreadLocalRandom; /** @@ -226,12 +223,4 @@ public class RedissonMultiLock implements Lock { throw new UnsupportedOperationException(); } - protected boolean isLockFailed(Future future) { - return !future.isSuccess(); - } - - protected boolean isAllLocksAcquired(AtomicReference lockedLockHolder, AtomicReference failed, Queue lockedLocks) { - return lockedLockHolder.get() == null && failed.get() == null; - } - } diff --git a/redisson/src/main/java/org/redisson/RedissonRedLock.java b/redisson/src/main/java/org/redisson/RedissonRedLock.java index 86fd7feaa..4b6aa4689 100644 --- a/redisson/src/main/java/org/redisson/RedissonRedLock.java +++ b/redisson/src/main/java/org/redisson/RedissonRedLock.java @@ -16,13 +16,9 @@ package org.redisson; import java.util.List; -import java.util.Queue; -import java.util.concurrent.atomic.AtomicReference; import org.redisson.api.RLock; -import io.netty.util.concurrent.Future; - /** * RedLock locking algorithm implementation for multiple locks. * It manages all locks as one. @@ -58,14 +54,4 @@ public class RedissonRedLock extends RedissonMultiLock { unlockInner(locks); } - @Override - protected boolean isLockFailed(Future future) { - return false; - } - - @Override - protected boolean isAllLocksAcquired(AtomicReference lockedLockHolder, AtomicReference failed, Queue lockedLocks) { - return (lockedLockHolder.get() == null && failed.get() == null) || lockedLocks.size() >= minLocksAmount(locks); - } - }