From cb913a9adcbe83b5688478cf538f11631b1270da Mon Sep 17 00:00:00 2001
From: fanc <1571025887@qq.com>
Date: 星期四, 25 一月 2024 14:48:29 +0800
Subject: [PATCH] fix 提升锁的作用域 并采用双重校验锁
---
ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java
index cbda62a..f0760f7 100644
--- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/factory/OssFactory.java
@@ -25,6 +25,8 @@
private static final Map<String, OssClient> CLIENT_CACHE = new ConcurrentHashMap<>();
+ private static final ReentrantLock lock = new ReentrantLock();
+
/**
* 鑾峰彇榛樿瀹炰緥
*/
@@ -51,12 +53,14 @@
OssClient client = CLIENT_CACHE.get(key);
// 瀹㈡埛绔笉瀛樺湪鎴栭厤缃笉鐩稿悓鍒欓噸鏂版瀯寤�
if (client == null || !client.checkPropertiesSame(properties)) {
- ReentrantLock lock = new ReentrantLock();
lock.lock();
try {
- CLIENT_CACHE.put(key, new OssClient(configKey, properties));
- log.info("鍒涘缓OSS瀹炰緥 key => {}", configKey);
- return CLIENT_CACHE.get(key);
+ client = CLIENT_CACHE.get(key);
+ if (client == null || !client.checkPropertiesSame(properties)) {
+ CLIENT_CACHE.put(key, new OssClient(configKey, properties));
+ log.info("鍒涘缓OSS瀹炰緥 key => {}", configKey);
+ return CLIENT_CACHE.get(key);
+ }
} finally {
lock.unlock();
}
--
Gitblit v1.9.3