Ghidra is a software reverse engineering (SRE) framework
Keep cache replacements when stale references are collected
Rudy Celekli504f90b4a02c
diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/AbstractWeakValueMap.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/AbstractWeakValueMap.javaindex 707ee9d763..a39886d238 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/AbstractWeakValueMap.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/AbstractWeakValueMap.java@@ -151,7 +151,7 @@ public abstract class AbstractWeakValueMap<K, V> implements Map<K, V> {protected void processQueue() {WeakValueRef<K, V> ref;while ((ref = (WeakValueRef<K, V>) refQueue.poll()) != null) {- getRefMap().remove(ref.key);+ getRefMap().remove(ref.key, ref);}}diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectCache.java b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectCache.javaindex 80c5663b6d..4eefeca239 100644--- a/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectCache.java+++ b/Ghidra/Framework/Generic/src/main/java/ghidra/util/datastruct/ObjectCache.java@@ -163,7 +163,7 @@ public class ObjectCache<T> {private void processQueue() {KeyedSoftReference<? extends T> ref;while ((ref = (KeyedSoftReference<? extends T>) refQueue.poll()) != null) {- hashTable.remove(ref.getKey());+ hashTable.remove(ref.getKey(), ref);}}