From fdcbe775eac11957f858604bb1832fa11c3ed889 Mon Sep 17 00:00:00 2001 From: zlt2000 Date: Mon, 7 Sep 2020 12:56:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D@Lock=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=E8=A7=A3=E9=94=81=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/central/common/lock/DistributedLock.java | 4 +++- .../src/main/java/com/central/common/lock/LockAspect.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/zlt-commons/zlt-common-core/src/main/java/com/central/common/lock/DistributedLock.java b/zlt-commons/zlt-common-core/src/main/java/com/central/common/lock/DistributedLock.java index db86968..6bdbefc 100644 --- a/zlt-commons/zlt-common-core/src/main/java/com/central/common/lock/DistributedLock.java +++ b/zlt-commons/zlt-common-core/src/main/java/com/central/common/lock/DistributedLock.java @@ -65,6 +65,8 @@ public interface DistributedLock { * @param zLock 锁抽象对象 */ default void unlock(ZLock zLock) throws Exception { - this.unlock(zLock.getLock()); + if (zLock != null) { + this.unlock(zLock.getLock()); + } } } diff --git a/zlt-commons/zlt-common-core/src/main/java/com/central/common/lock/LockAspect.java b/zlt-commons/zlt-common-core/src/main/java/com/central/common/lock/LockAspect.java index f25d5f1..f160e33 100644 --- a/zlt-commons/zlt-common-core/src/main/java/com/central/common/lock/LockAspect.java +++ b/zlt-commons/zlt-common-core/src/main/java/com/central/common/lock/LockAspect.java @@ -40,7 +40,6 @@ public class LockAspect { @Around("@within(lock) || @annotation(lock)") public Object aroundLock(ProceedingJoinPoint point, Lock lock) throws Throwable { - Object lockObj = null; if (lock == null) { // 获取类上的注解 lock = point.getTarget().getClass().getDeclaredAnnotation(Lock.class); @@ -59,6 +58,7 @@ public class LockAspect { Object[] args = point.getArgs(); lockKey = getValBySpEL(lockKey, methodSignature, args); } + ZLock lockObj = null; try { //加锁 if (lock.waitTime() > 0) { -- GitLab