Refactor asset handling as per Ubit's suggestion

2 files changed, 20 insertions, 35 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
 
             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)
             {
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index af5f69a..953bc2a 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -136,9 +136,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
             // Cache fetch
             if (m_cache != null)
             {
-                bool negative;
-                AssetBase asset = m_cache.Get(id, out negative);
-                if (negative)
+                AssetBase asset;
+                if (!m_cache.Get(id, out asset))
                     return null;
                 if (asset != null)
                     return asset;
@@ -150,9 +149,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public AssetBase GetCached(string id)
         {
-            bool negative;
+            AssetBase asset;
             if (m_cache != null)
-                return m_cache.Get(id, out negative);
+                m_cache.Get(id, out asset);
 
             return null;
         }
@@ -173,9 +172,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
             // Cache fetch
             if (m_cache != null)
             {
-                bool negative;
-                AssetBase asset = m_cache.Get(id, out negative);
-                if (negative)
+                AssetBase asset;
+                if (!m_cache.Get(id, out asset))
                     return null;
                 if (asset != null)
                     return asset.Metadata;
@@ -219,10 +217,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
             // Cache fetch
             if (m_cache != null)
             {
-                bool negative;
-                AssetBase asset = m_cache.Get(id, out negative);
-
-                if (negative)
+                AssetBase asset;
+                if (!m_cache.Get(id, out asset))
                     return false;
 
                 if (asset != null)