Refactor asset handling as per Ubit's suggestion

2 files changed, 12 insertions, 32 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index ce61ff0..bf9327c 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -209,10 +209,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
             if (m_Cache != null)
             {
-                bool negative;
-                asset = m_Cache.Get(id, out negative);
-
-                if (negative)
+                if (!m_Cache.Get(id, out asset))
                     return null;
 
                 if (asset != null)
@@ -242,9 +239,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
         public AssetBase GetCached(string 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;
         }
@@ -255,10 +252,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
             if (m_Cache != null)
             {
-                bool negative;
-                asset = m_Cache.Get(id, out negative);
-
-                if (negative)
+                if (!m_Cache.Get(id, out asset))
                     return null;
 
                 if (asset != null)
@@ -281,10 +275,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
             if (m_Cache != null)
             {
-                bool negative;
-                asset = m_Cache.Get(id, out negative);
-
-                if (negative)
+                if (!m_Cache.Get(id, out asset))
                     return null;
 
                 if (asset != null)
@@ -304,10 +295,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
             if (m_Cache != null)
             {
-                bool negative;
-                asset = m_Cache.Get(id, out negative);
-
-                if (negative)
+                if (!m_Cache.Get(id, out asset))
                     return false;
             }
 
@@ -398,9 +386,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         {
             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)
             {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
index bbaed21..2fe9733 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
@@ -159,10 +159,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
             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 null;
             }
 
@@ -183,13 +180,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         {
 //            m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Cache request for {0}", id);
 
+            AssetBase asset = null;
             if (m_Cache != null)
-            {
-                bool negative;
-                return m_Cache.Get(id, out negative);
-            }
+                m_Cache.Get(id, out asset);
 
-            return null;
+            return asset;
         }
 
         public AssetMetadata GetMetadata(string id)
@@ -197,9 +192,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
             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 null;
             }