be paranoic (?)

1 files changed, 6 insertions, 0 deletions

diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index d8e0be4..45ebf3a 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -316,6 +316,8 @@ namespace OpenSim.Services.Connectors
                             }
                             foreach (AssetRetrievedEx h in handlers)
                                 h.Invoke(a);
+                            if (handlers != null)
+                                handlers.Clear();
                         });
                     
                     success = true;
@@ -324,10 +326,14 @@ namespace OpenSim.Services.Connectors
                 {
                     if (!success)
                     {
+                        List<AssetRetrievedEx> handlers;
                         lock (m_AssetHandlers)
                         {
+                            handlers = m_AssetHandlers[id];
                             m_AssetHandlers.Remove(id);
                         }
+                        if (handlers != null)
+                        handlers.Clear();
                     }
                 }
             }