OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes seven leaky .BeginInvoke() calls

remotes/origin/0.6.7-post-fixes
John Hurliman 2009-09-01 12:07:48 -07:00 committed by Diva Canto
parent 584c113836
commit 33133e23b1
6 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
View File

@ -272,7 +272,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
if (asset != null) if (asset != null)
{ {
handler.BeginInvoke(id, sender, asset, null, null); Util.FireAndForget(delegate { handler(id, sender, asset); });
return true; return true;
} }

4
OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
View File

@ -211,7 +211,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
if (asset != null) if (asset != null)
{ {
handler.BeginInvoke(id, sender, asset, null, null); Util.FireAndForget(delegate { handler(id, sender, asset); });
return true; return true;
} }
@ -220,7 +220,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
if ((a != null) && (m_Cache != null)) if ((a != null) && (m_Cache != null))
m_Cache.Cache(a); m_Cache.Cache(a);
handler.BeginInvoke(assetID, s, a, null, null); Util.FireAndForget(delegate { handler(assetID, s, a); });
}); });
} }

4
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
View File

@ -457,6 +457,8 @@ namespace OpenSim.Region.Framework.Scenes
void SendInventoryComplete(IAsyncResult iar) void SendInventoryComplete(IAsyncResult iar)
{ {
SendInventoryDelegate d = (SendInventoryDelegate)iar.AsyncState;
d.EndInvoke(iar);
} }
/// <summary> /// <summary>
@ -622,6 +624,8 @@ namespace OpenSim.Region.Framework.Scenes
private void PurgeFolderCompleted(IAsyncResult iar) private void PurgeFolderCompleted(IAsyncResult iar)
{ {
PurgeFolderDelegate d = (PurgeFolderDelegate)iar.AsyncState;
d.EndInvoke(iar);
} }
} }
} }

2
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
View File

@ -177,7 +177,7 @@ namespace OpenSim.Services.Connectors
} }
else else
{ {
handler.BeginInvoke(id, sender, asset, null, null); Util.FireAndForget(delegate { handler(id, sender, asset); });
} }
return true; return true;

2
OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
View File

@ -461,6 +461,8 @@ namespace OpenSim.Services.Connectors
private void MoveItemsCompleted(IAsyncResult iar) private void MoveItemsCompleted(IAsyncResult iar)
{ {
MoveItemsDelegate d = (MoveItemsDelegate)iar.AsyncState;
d.EndInvoke(iar);
} }
public bool MoveItems(string userID, List<InventoryItemBase> items, UUID sessionID) public bool MoveItems(string userID, List<InventoryItemBase> items, UUID sessionID)

2
OpenSim/Services/InventoryService/InventoryService.cs
View File

@ -232,7 +232,7 @@ namespace OpenSim.Services.InventoryService
m_log.WarnFormat("[INVENTORY SERVICE]: User {0} inventory not available", userID); 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) public InventoryCollection GetFolderContent(UUID userID, UUID folderID)