Merge pull request #438 from theTd/resettablelazy-leak

[6.1.2] Optimize ResettableLazy: Use weak references to prevent memory leak
TabooLib · Aug 11, 2024 · 74c3507 · 74c3507
2 parents f978188 + 299ca8c
commit 74c3507
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/common-util/src/main/kotlin/taboolib/common/util/LazyMaker.kt b/common-util/src/main/kotlin/taboolib/common/util/LazyMaker.kt
@@ -1,6 +1,6 @@
 package taboolib.common.util
 
-import java.util.*
+import com.google.common.cache.CacheBuilder
 
 /**
  * 声明一个线程不安全的延迟加载对象
@@ -22,7 +22,7 @@ fun <T> resettableLazy(vararg groups: String, synchronized: Boolean = false, ini
     } else {
         ResettableLazyImpl(*groups, initializer = initializer)
     }.also {
-        ResettableLazy.defined += it
+        ResettableLazy.defined.put(it, Unit)
     }
 }
 
@@ -32,17 +32,15 @@ abstract class ResettableLazy<T>(vararg val groups: String) : Lazy<T> {
 
     companion object {
 
-        val defined = LinkedList<ResettableLazy<*>>()
+        val defined = CacheBuilder.newBuilder().weakKeys().build<ResettableLazy<*>, Unit>()
 
         fun reset(vararg groups: String) {
-            synchronized(defined) {
-                if (groups.isEmpty() || groups.contains("*")) {
-                    defined.forEach { it.reset() }
-                } else {
-                    defined.filter { lazy ->
-                        groups.any { lazy.groups.contains(it) }
-                    }.forEach { it.reset() }
-                }
+            if (groups.isEmpty() || groups.contains("*")) {
+                defined.asMap().keys.forEach { it.reset() }
+            } else {
+                defined.asMap().keys.filter { lazy ->
+                    groups.any { lazy.groups.contains(it) }
+                }.forEach { it.reset() }
             }
         }
     }