From 33133e23b12781e71b499fcaa41bcad6374c6656 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Tue, 1 Sep 2009 12:07:48 -0700
Subject: Fixes seven leaky .BeginInvoke() calls

---
 OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs         | 2 +-
 OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs | 2 ++
 OpenSim/Services/InventoryService/InventoryService.cs              | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Services')

diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index d9748d4..ffc8e4c 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -177,7 +177,7 @@ namespace OpenSim.Services.Connectors
             }
             else
             {
-                handler.BeginInvoke(id, sender, asset, null, null);
+                Util.FireAndForget(delegate { handler(id, sender, asset); });
             }
 
             return true;
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index a2261ba..cef678d 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -461,6 +461,8 @@ namespace OpenSim.Services.Connectors
 
         private void MoveItemsCompleted(IAsyncResult iar)
         {
+            MoveItemsDelegate d = (MoveItemsDelegate)iar.AsyncState;
+            d.EndInvoke(iar);
         }
 
         public bool MoveItems(string userID, List<InventoryItemBase> items, UUID sessionID)
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index f04754b..b98e256 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -232,7 +232,7 @@ namespace OpenSim.Services.InventoryService
                 m_log.WarnFormat("[INVENTORY SERVICE]: User {0} inventory not available", userID);
             }
 
-            callback.BeginInvoke(folders, items, null, null);
+            Util.FireAndForget(delegate { callback(folders, items); });
         }
 
         public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
-- 
cgit v1.1