From 50f818c480fec80ccbf7562bb2e65ae778a6a8ec Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Sat, 6 Apr 2024 21:54:36 +0100
Subject: [PATCH] also expire flotsam assets weakreferences

---
 .../CoreModules/Asset/FlotsamAssetCache.cs    | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index d2524f1af2..97753b14e5 100755
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -352,10 +352,11 @@ namespace OpenSim.Region.CoreModules.Asset
         {
             lock(weakAssetReferencesLock)
             {
-                if(weakAssetReferences.TryGetValue(key , out WeakReference aref))
+                ref WeakReference aref = ref CollectionsMarshal.GetValueRefOrAddDefault(weakAssetReferences, key, out bool ex);
+                if(ex)
                     aref.Target = asset;
                 else
-                    weakAssetReferences[key] = new WeakReference(asset);
+                    aref = new WeakReference(asset);
             }
         }
 
@@ -463,20 +464,18 @@ namespace OpenSim.Region.CoreModules.Asset
 
         private AssetBase GetFromWeakReference(string id)
         {
-            AssetBase asset = null;
-
             lock(weakAssetReferencesLock)
             {
                 if (weakAssetReferences.TryGetValue(id, out WeakReference aref))
                 {
-                    asset = aref.Target as AssetBase;
-                    if(asset is null)
-                        weakAssetReferences.Remove(id);
-                    else
+                    if (aref.Target is AssetBase asset)
+                    {
                         m_weakRefHits++;
+                        return asset;
+                    }
                 }
             }
-            return asset;
+            return null;
         }
 
         /// <summary>
@@ -793,6 +792,9 @@ namespace OpenSim.Region.CoreModules.Asset
 
             // Purge all files last accessed prior to this point
             DoCleanExpiredFiles(DateTime.Now - m_FileExpiration);
+
+            lock (weakAssetReferencesLock)
+                weakAssetReferences = new Dictionary<string, WeakReference>();
         }
 
         private void DoCleanExpiredFiles(DateTime purgeLine)