diff options
author | John Hurliman | 2009-09-01 12:07:48 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-03 12:36:51 -0700 |
commit | 33133e23b12781e71b499fcaa41bcad6374c6656 (patch) | |
tree | bc94accc274e9b319b9cca9f5194bc9ddcbff471 /OpenSim/Services | |
parent | Added Util.FireAndForget(), to replace leaking calls to Delegate.BeginInvoke() (diff) | |
download | opensim-SC-33133e23b12781e71b499fcaa41bcad6374c6656.zip opensim-SC-33133e23b12781e71b499fcaa41bcad6374c6656.tar.gz opensim-SC-33133e23b12781e71b499fcaa41bcad6374c6656.tar.bz2 opensim-SC-33133e23b12781e71b499fcaa41bcad6374c6656.tar.xz |
Fixes seven leaky .BeginInvoke() calls
Diffstat (limited to 'OpenSim/Services')
3 files changed, 4 insertions, 2 deletions
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 | |||
177 | } | 177 | } |
178 | else | 178 | else |
179 | { | 179 | { |
180 | handler.BeginInvoke(id, sender, asset, null, null); | 180 | Util.FireAndForget(delegate { handler(id, sender, asset); }); |
181 | } | 181 | } |
182 | 182 | ||
183 | return true; | 183 | 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 | |||
461 | 461 | ||
462 | private void MoveItemsCompleted(IAsyncResult iar) | 462 | private void MoveItemsCompleted(IAsyncResult iar) |
463 | { | 463 | { |
464 | MoveItemsDelegate d = (MoveItemsDelegate)iar.AsyncState; | ||
465 | d.EndInvoke(iar); | ||
464 | } | 466 | } |
465 | 467 | ||
466 | public bool MoveItems(string userID, List<InventoryItemBase> items, UUID sessionID) | 468 | 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 | |||
232 | m_log.WarnFormat("[INVENTORY SERVICE]: User {0} inventory not available", userID); | 232 | m_log.WarnFormat("[INVENTORY SERVICE]: User {0} inventory not available", userID); |
233 | } | 233 | } |
234 | 234 | ||
235 | callback.BeginInvoke(folders, items, null, null); | 235 | Util.FireAndForget(delegate { callback(folders, items); }); |
236 | } | 236 | } |
237 | 237 | ||
238 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) | 238 | public InventoryCollection GetFolderContent(UUID userID, UUID folderID) |