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

Merge branch 'master' into httptests

httptests
UbitUmarov 2016-11-03 17:19:02 +00:00
parent 01a4a883e0 d2e380e81e
commit 0c39a3e348
1 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
View File

@ -347,51 +347,34 @@ namespace OpenSim.Services.Connectors
string uri = r.uri; string uri = r.uri;
string id = r.id; string id = r.id;
bool success = false;
try try
{ {
AssetBase a = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, 30000, m_Auth); AssetBase a = SynchronousRestObjectRequester.MakeRequest<int, AssetBase>("GET", uri, 0, 30000, m_Auth);
if (a != null)
if (a != null && m_Cache != null)
m_Cache.Cache(a);
List<AssetRetrievedEx> handlers;
lock (m_AssetHandlers)
{ {
if (m_Cache != null) handlers = m_AssetHandlers[id];
m_Cache.Cache(a); m_AssetHandlers.Remove(id);
}
List<AssetRetrievedEx> handlers; if(handlers != null)
lock (m_AssetHandlers) {
Util.FireAndForget(x =>
{ {
handlers = m_AssetHandlers[id]; foreach (AssetRetrievedEx h in handlers)
m_AssetHandlers.Remove(id);
}
if(handlers != null)
{
Util.FireAndForget(x =>
{ {
foreach (AssetRetrievedEx h in handlers) try { h.Invoke(a); }
{ catch { }
try { h.Invoke(a); } }
catch { }
}
handlers.Clear();
});
}
success = true;
}
}
finally
{
if (!success)
{
List<AssetRetrievedEx> handlers;
lock (m_AssetHandlers)
{
handlers = m_AssetHandlers[id];
m_AssetHandlers.Remove(id);
}
if (handlers != null)
handlers.Clear(); handlers.Clear();
});
} }
} }
catch { }
} }
} }