From a5151bb337cfee14dff6045d7f8e293201ae94ac Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 1 Feb 2017 16:31:01 +0000
Subject: Refactor asset handling as per Ubit's suggestion

---
 .../Connectors/Asset/AssetServicesConnector.cs     | 35 ++++++++--------------
 1 file changed, 12 insertions(+), 23 deletions(-)

(limited to 'OpenSim/Services/Connectors/Asset')

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
 
             if (m_Cache != null)
             {
-                bool negative;
-
-                asset = m_Cache.Get(id, out negative);
-
-                if (negative)
+                if (!m_Cache.Get(id, out asset))
                     return null;
             }
 
@@ -283,21 +279,21 @@ namespace OpenSim.Services.Connectors
         {
 //            m_log.DebugFormat("[ASSET SERVICE CONNECTOR]: Cache request for {0}", id);
 
-            bool negative;
+            AssetBase asset = null;
             if (m_Cache != null)
-                return m_Cache.Get(id, out negative);
+            {
+                m_Cache.Get(id, out asset);
+            }
 
-            return null;
+            return asset;
         }
 
         public AssetMetadata GetMetadata(string id)
         {
             if (m_Cache != null)
             {
-                bool negative;
-                AssetBase fullAsset = m_Cache.Get(id, out negative);
-
-                if (negative)
+                AssetBase fullAsset;
+                if (!m_Cache.Get(id, out fullAsset))
                     return null;
 
                 if (fullAsset != null)
@@ -314,10 +310,8 @@ namespace OpenSim.Services.Connectors
         {
             if (m_Cache != null)
             {
-                bool negative;
-                AssetBase fullAsset = m_Cache.Get(id, out negative);
-
-                if (negative)
+                AssetBase fullAsset;
+                if (!m_Cache.Get(id, out fullAsset))
                     return null;
 
                 if (fullAsset != null)
@@ -407,11 +401,7 @@ namespace OpenSim.Services.Connectors
             AssetBase asset = null;
             if (m_Cache != null)
             {
-                bool negative;
-
-                asset = m_Cache.Get(id, out negative);
-
-                if (negative)
+                if (!m_Cache.Get(id, out asset))
                     return false;
             }
 
@@ -613,9 +603,8 @@ namespace OpenSim.Services.Connectors
         {
             AssetBase asset = null;
 
-            bool negative;
             if (m_Cache != null)
-                asset = m_Cache.Get(id, out negative);
+                m_Cache.Get(id, out asset);
 
             if (asset == null)
             {
-- 
cgit v1.1