Make negative asset caching actually work

Also fixes some merge artefacts in HGAssetBroker where cached assets
were requested but not actually used and completely squelch a materials
debug message because there is nothing the user can do to fix it anyway.

2 files changed, 56 insertions, 14 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index f5aa971..ce61ff0 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -209,7 +209,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
             if (m_Cache != null)
             {
-                asset = m_Cache.Get(id);
+                bool negative;
+                asset = m_Cache.Get(id, out negative);
+
+                if (negative)
+                    return null;
 
                 if (asset != null)
                     return asset;
@@ -238,8 +242,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
         public AssetBase GetCached(string id)
         {
+            bool negative;
             if (m_Cache != null)
-                return m_Cache.Get(id);
+                return m_Cache.Get(id, out negative);
 
             return null;
         }
@@ -250,8 +255,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
             if (m_Cache != null)
             {
-                if (m_Cache != null)
-                    m_Cache.Get(id);
+                bool negative;
+                asset = m_Cache.Get(id, out negative);
+
+                if (negative)
+                    return null;
 
                 if (asset != null)
                     return asset.Metadata;
@@ -273,8 +281,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
             if (m_Cache != null)
             {
-                if (m_Cache != null)
-                    m_Cache.Get(id);
+                bool negative;
+                asset = m_Cache.Get(id, out negative);
+
+                if (negative)
+                    return null;
 
                 if (asset != null)
                     return asset.Data;
@@ -292,7 +303,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
             AssetBase asset = null;
 
             if (m_Cache != null)
-                asset = m_Cache.Get(id);
+            {
+                bool negative;
+                asset = m_Cache.Get(id, out negative);
+
+                if (negative)
+                    return false;
+            }
 
             if (asset != null)
             {
@@ -381,8 +398,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         {
             AssetBase asset = null;
 
+            bool negative;
             if (m_Cache != null)
-                asset = m_Cache.Get(id);
+                asset = m_Cache.Get(id, out negative);
 
             if (asset != null)
             {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
index 7190aa0..bbaed21 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/LocalAssetServiceConnector.cs
@@ -158,7 +158,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
             AssetBase asset = null;
             if (m_Cache != null)
-                asset = m_Cache.Get(id);
+            {
+                bool negative;
+                asset = m_Cache.Get(id, out negative);
+
+                if (negative)
+                    return null;
+            }
 
             if (asset == null)
             {
@@ -178,7 +184,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 //            m_log.DebugFormat("[LOCAL ASSET SERVICES CONNECTOR]: Cache request for {0}", id);
 
             if (m_Cache != null)
-                return m_Cache.Get(id);
+            {
+                bool negative;
+                return m_Cache.Get(id, out negative);
+            }
 
             return null;
         }
@@ -187,7 +196,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         {
             AssetBase asset = null;
             if (m_Cache != null)
-                asset = m_Cache.Get(id);
+            {
+                bool negative;
+                asset = m_Cache.Get(id, out negative);
+                if (negative)
+                    return null;
+            }
 
             if (asset != null)
                 return asset.Metadata;
@@ -210,7 +224,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
             AssetBase asset = null;
 
             if (m_Cache != null)
-                asset = m_Cache.Get(id);
+            {
+                bool negative;
+                asset = m_Cache.Get(id, out negative);
+                if (negative)
+                    return null;
+            }
 
             if (asset != null)
                 return asset.Data;
@@ -232,7 +251,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
 
             if (m_Cache != null)
             {
-                AssetBase asset = m_Cache.Get(id);
+                bool negative;
+                AssetBase asset = m_Cache.Get(id, out negative);
+
+                if (negative)
+                    return false;
 
                 if (asset != null)
                 {
@@ -286,8 +309,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
         public bool UpdateContent(string id, byte[] data)
         {
             AssetBase asset = null;
+            bool negative;
             if (m_Cache != null)
-                m_Cache.Get(id);
+                m_Cache.Get(id, out negative);
             if (asset != null)
             {
                 asset.Data = data;