From 9ac7d118138deff5ff38a74592839a63e3a7a695 Mon Sep 17 00:00:00 2001
From: C-H716 <1536152356@qq.com>
Date: Fri, 26 Sep 2025 17:57:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=9E=E4=BD=93?=
 =?UTF-8?q?=E5=8A=A0=E9=80=9F=E5=99=A8=E9=BB=91=E5=90=8D=E5=8D=95=E5=92=8C?=
 =?UTF-8?q?=E5=80=8D=E7=8E=87=E5=90=8D=E5=8D=95=E6=97=A0=E6=B3=95=E7=83=AD?=
 =?UTF-8?q?=E9=87=8D=E8=BD=BD=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../util/ConfigParsingUtils.java              | 83 ++++++++++++-------
 1 file changed, 53 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/extendedae_plus/util/ConfigParsingUtils.java b/src/main/java/com/extendedae_plus/util/ConfigParsingUtils.java
index c1f2395..0cf6ddc 100644
--- a/src/main/java/com/extendedae_plus/util/ConfigParsingUtils.java
+++ b/src/main/java/com/extendedae_plus/util/ConfigParsingUtils.java
@@ -114,48 +114,71 @@ public final class ConfigParsingUtils {
     // ------------------ 全局缓存与接口 ------------------
     private static volatile List<Pattern> cachedBlacklist = null;
     private static volatile List<MultiplierEntry> cachedMultiplierEntries = null;
+    private static volatile List<String> cachedBlacklistSourceSnapshot = null;
+    private static volatile List<String> cachedMultiplierSourceSnapshot = null;
     private static final Object CACHE_LOCK = new Object();
 
     /**
      * 获取已解析并缓存的黑名单（线程安全、懒加载）。
      */
-    public static List<Pattern> getCachedBlacklist(List<? extends String> source) {
-        if (cachedBlacklist == null) {
-            synchronized (CACHE_LOCK) {
-                if (cachedBlacklist == null) {
-                    cachedBlacklist = compilePatterns(source);
-                }
-            }
-        } else {
-            synchronized (CACHE_LOCK) {
-                List<Pattern> newCachedBlackList = compilePatterns(source);
-                if (!cachedBlacklist.equals(newCachedBlackList)) {
-                    cachedBlacklist = newCachedBlackList;
-                }
-            }
+    public static List<Pattern> getCachedBlacklist(java.util.List<? extends String> source) {
+        List<String> normalized = normalizeSource(source);
+
+        // fast path: identical snapshot reference or equal contents
+        if (cachedBlacklist != null && listEquals(cachedBlacklistSourceSnapshot, normalized)) {
+            return Collections.unmodifiableList(cachedBlacklist);
+        }
+
+        synchronized (CACHE_LOCK) {
+            if (cachedBlacklist == null || !listEquals(cachedBlacklistSourceSnapshot, normalized)) {
+                cachedBlacklist = compilePatterns(normalized);
+                cachedBlacklistSourceSnapshot = normalized.isEmpty() ? Collections.emptyList() : new ArrayList<>(normalized);
+            }
+            return Collections.unmodifiableList(cachedBlacklist);
         }
-        return Collections.unmodifiableList(cachedBlacklist);
     }
 
     /**
      * 获取已解析并缓存的倍率列表（线程安全、懒加载）。
      */
-    public static List<MultiplierEntry> getCachedMultiplierEntries(List<? extends String> source) {
-        if (cachedMultiplierEntries == null) {
-            synchronized (CACHE_LOCK) {
-                if (cachedMultiplierEntries == null) {
-                    cachedMultiplierEntries = parseMultiplierList(source);
-                }
-            }
-        }else {
-            synchronized (CACHE_LOCK) {
-                List<MultiplierEntry> newCachedMultiplierEntries = parseMultiplierList(source);
-                if (!cachedMultiplierEntries.equals(newCachedMultiplierEntries)) {
-                    cachedMultiplierEntries = newCachedMultiplierEntries;
-                }
-            }
+    public static List<MultiplierEntry> getCachedMultiplierEntries(java.util.List<? extends String> source) {
+        List<String> normalized = normalizeSource(source);
+
+        if (cachedMultiplierEntries != null && listEquals(cachedMultiplierSourceSnapshot, normalized)) {
+            return Collections.unmodifiableList(cachedMultiplierEntries);
         }
-        return Collections.unmodifiableList(cachedMultiplierEntries);
+
+        synchronized (CACHE_LOCK) {
+            if (cachedMultiplierEntries == null || !listEquals(cachedMultiplierSourceSnapshot, normalized)) {
+                cachedMultiplierEntries = parseMultiplierList(normalized);
+                cachedMultiplierSourceSnapshot = normalized.isEmpty() ? Collections.emptyList() : new ArrayList<>(normalized);
+            }
+            return Collections.unmodifiableList(cachedMultiplierEntries);
+        }
+    }
+
+    // Normalize the incoming source list: trim entries, drop blanks, keep stable ordering
+    private static List<String> normalizeSource(java.util.List<? extends String> source) {
+        List<String> out = new ArrayList<>();
+        if (source == null) return out;
+        for (String s : source) {
+            if (s == null) continue;
+            String t = s.trim();
+            if (t.isEmpty()) continue;
+            out.add(t);
+        }
+        return out;
+    }
+
+    // Null-safe equality for two lists of strings. Uses size + element equals.
+    private static boolean listEquals(List<String> a, List<String> b) {
+        if (a == b) return true;
+        if (a == null || b == null) return false;
+        if (a.size() != b.size()) return false;
+        for (int i = 0; i < a.size(); i++) {
+            if (!a.get(i).equals(b.get(i))) return false;
+        }
+        return true;
     }
 
     /**