From dc0455e217b8da3fc8bd49e959b57d6021312b77 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 28 Jun 2013 19:11:44 +0100
Subject: In XAssetService, on a delete asset request also delete the asset in
 any chained service.

This eliminates the async migration since it causes a race condition with the "delete asset" console command
---
 OpenSim/Services/AssetService/XAssetService.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Services/AssetService/XAssetService.cs')

diff --git a/OpenSim/Services/AssetService/XAssetService.cs b/OpenSim/Services/AssetService/XAssetService.cs
index 8a2ca7c..6047616 100644
--- a/OpenSim/Services/AssetService/XAssetService.cs
+++ b/OpenSim/Services/AssetService/XAssetService.cs
@@ -205,15 +205,16 @@ namespace OpenSim.Services.AssetService
             if (!UUID.TryParse(id, out assetID))
                 return false;
 
-            // Don't bother deleting from a chained asset service.  This isn't a big deal since deleting happens
-            // very rarely.
+            if (HasChainedAssetService)
+                m_ChainedAssetService.Delete(id);
 
             return m_Database.Delete(id);
         }
 
         private void MigrateFromChainedService(AssetBase asset)
         {
-            Util.FireAndForget(o => { Store(asset); m_ChainedAssetService.Delete(asset.ID); });
+            Store(asset); 
+            m_ChainedAssetService.Delete(asset.ID);
         }
     }
 }
\ No newline at end of file
-- 
cgit v1.1