fix merge

1 files changed, 12 insertions, 4 deletions

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 121e863..953bc2a 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -136,7 +136,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
             // Cache fetch
             if (m_cache != null)
             {
-                AssetBase asset = m_cache.Get(id);
+                AssetBase asset;
+                if (!m_cache.Get(id, out asset))
+                    return null;
                 if (asset != null)
                     return asset;
             }
@@ -147,8 +149,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public AssetBase GetCached(string id)
         {
+            AssetBase asset;
             if (m_cache != null)
-                return m_cache.Get(id);
+                m_cache.Get(id, out asset);
 
             return null;
         }
@@ -169,7 +172,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
             // Cache fetch
             if (m_cache != null)
             {
-                AssetBase asset = m_cache.Get(id);
+                AssetBase asset;
+                if (!m_cache.Get(id, out asset))
+                    return null;
                 if (asset != null)
                     return asset.Metadata;
             }
@@ -212,7 +217,10 @@ namespace OpenSim.Services.Connectors.SimianGrid
             // Cache fetch
             if (m_cache != null)
             {
-                AssetBase asset = m_cache.Get(id);
+                AssetBase asset;
+                if (!m_cache.Get(id, out asset))
+                    return false;
+
                 if (asset != null)
                 {
                     handler(id, sender, asset);