aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2014-09-17 17:00:13 +0100
committerUbitUmarov2014-09-17 17:00:13 +0100
commit060984502eeabb59cade86e5e2b27db888229db3 (patch)
tree4367c65549017efcae2b025309d8b979dc2be8d8 /OpenSim
parent another close() (diff)
downloadopensim-SC_OLD-060984502eeabb59cade86e5e2b27db888229db3.zip
opensim-SC_OLD-060984502eeabb59cade86e5e2b27db888229db3.tar.gz
opensim-SC_OLD-060984502eeabb59cade86e5e2b27db888229db3.tar.bz2
opensim-SC_OLD-060984502eeabb59cade86e5e2b27db888229db3.tar.xz
and another one
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index bf0cc35..9b0ebcf 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -284,9 +284,11 @@ namespace OpenSim.Services.Connectors
284 byte[] ret = new byte[s.Length]; 284 byte[] ret = new byte[s.Length];
285 s.Read(ret, 0, (int)s.Length); 285 s.Read(ret, 0, (int)s.Length);
286 286
287 s.Close();
287 return ret; 288 return ret;
288 } 289 }
289 290
291 s.Close();
290 return null; 292 return null;
291 } 293 }
292 294
@@ -325,13 +327,16 @@ namespace OpenSim.Services.Connectors
325 handlers = m_AssetHandlers[id]; 327 handlers = m_AssetHandlers[id];
326 m_AssetHandlers.Remove(id); 328 m_AssetHandlers.Remove(id);
327 } 329 }
330
328 foreach (AssetRetrievedEx h in handlers) 331 foreach (AssetRetrievedEx h in handlers)
329 { 332 {
330 Util.FireAndForget(x => 333 Util.FireAndForget(x =>
331 { 334 {
332 h.Invoke(a); 335 try { h.Invoke(a); }
336 catch { }
333 }); 337 });
334 } 338 }
339
335 if (handlers != null) 340 if (handlers != null)
336 handlers.Clear(); 341 handlers.Clear();
337 342