aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
diff options
context:
space:
mode:
authorMelanie Thielker2017-02-01 16:31:01 +0000
committerMelanie Thielker2017-02-01 16:31:01 +0000
commita5151bb337cfee14dff6045d7f8e293201ae94ac (patch)
treef301338415da7160e48efcb4dc6cd1efc7faecaf /OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
parentSecure sim stats with an (optional) password. (diff)
downloadopensim-SC-a5151bb337cfee14dff6045d7f8e293201ae94ac.zip
opensim-SC-a5151bb337cfee14dff6045d7f8e293201ae94ac.tar.gz
opensim-SC-a5151bb337cfee14dff6045d7f8e293201ae94ac.tar.bz2
opensim-SC-a5151bb337cfee14dff6045d7f8e293201ae94ac.tar.xz
Refactor asset handling as per Ubit's suggestion
Diffstat (limited to 'OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs')
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs35
1 files changed, 12 insertions, 23 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 9595e7b..810da2f 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -246,11 +246,7 @@ namespace OpenSim.Services.Connectors
246 246
247 if (m_Cache != null) 247 if (m_Cache != null)
248 { 248 {
249 bool negative; 249 if (!m_Cache.Get(id, out asset))
250
251 asset = m_Cache.Get(id, out negative);
252
253 if (negative)
254 return null; 250 return null;
255 } 251 }
256 252
@@ -283,21 +279,21 @@ namespace OpenSim.Services.Connectors
283 { 279 {
284// m_log.DebugFormat("[ASSET SERVICE CONNECTOR]: Cache request for {0}", id); 280// m_log.DebugFormat("[ASSET SERVICE CONNECTOR]: Cache request for {0}", id);
285 281
286 bool negative; 282 AssetBase asset = null;
287 if (m_Cache != null) 283 if (m_Cache != null)
288 return m_Cache.Get(id, out negative); 284 {
285 m_Cache.Get(id, out asset);
286 }
289 287
290 return null; 288 return asset;
291 } 289 }
292 290
293 public AssetMetadata GetMetadata(string id) 291 public AssetMetadata GetMetadata(string id)
294 { 292 {
295 if (m_Cache != null) 293 if (m_Cache != null)
296 { 294 {
297 bool negative; 295 AssetBase fullAsset;
298 AssetBase fullAsset = m_Cache.Get(id, out negative); 296 if (!m_Cache.Get(id, out fullAsset))
299
300 if (negative)
301 return null; 297 return null;
302 298
303 if (fullAsset != null) 299 if (fullAsset != null)
@@ -314,10 +310,8 @@ namespace OpenSim.Services.Connectors
314 { 310 {
315 if (m_Cache != null) 311 if (m_Cache != null)
316 { 312 {
317 bool negative; 313 AssetBase fullAsset;
318 AssetBase fullAsset = m_Cache.Get(id, out negative); 314 if (!m_Cache.Get(id, out fullAsset))
319
320 if (negative)
321 return null; 315 return null;
322 316
323 if (fullAsset != null) 317 if (fullAsset != null)
@@ -407,11 +401,7 @@ namespace OpenSim.Services.Connectors
407 AssetBase asset = null; 401 AssetBase asset = null;
408 if (m_Cache != null) 402 if (m_Cache != null)
409 { 403 {
410 bool negative; 404 if (!m_Cache.Get(id, out asset))
411
412 asset = m_Cache.Get(id, out negative);
413
414 if (negative)
415 return false; 405 return false;
416 } 406 }
417 407
@@ -613,9 +603,8 @@ namespace OpenSim.Services.Connectors
613 { 603 {
614 AssetBase asset = null; 604 AssetBase asset = null;
615 605
616 bool negative;
617 if (m_Cache != null) 606 if (m_Cache != null)
618 asset = m_Cache.Get(id, out negative); 607 m_Cache.Get(id, out asset);
619 608
620 if (asset == null) 609 if (asset == null)
621 { 610 {