Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 30 insertions, 22 deletions

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 9ad4a7a..953bc2a 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         private static string ZeroID = UUID.Zero.ToString();
 
         private string m_serverUrl = String.Empty;
-        private IImprovedAssetCache m_cache;
+        private IAssetCache m_cache;
         private bool m_Enabled = false;
 
         #region ISharedRegionModule
@@ -65,7 +65,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         {
             if (m_cache == null)
             {
-                IImprovedAssetCache cache = scene.RequestModuleInterface<IImprovedAssetCache>();
+                IAssetCache cache = scene.RequestModuleInterface<IAssetCache>();
                 if (cache is ISharedRegionModule)
                     m_cache = cache;
             }
@@ -77,7 +77,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         public string Name { get { return "SimianAssetServiceConnector"; } }
         public void AddRegion(Scene scene) { if (m_Enabled) { scene.RegisterModuleInterface<IAssetService>(this); } }
         public void RemoveRegion(Scene scene) { if (m_Enabled) { scene.UnregisterModuleInterface<IAssetService>(this); } }
-        
+
         #endregion ISharedRegionModule
 
         public SimianAssetServiceConnector(IConfigSource source)
@@ -136,19 +136,22 @@ 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;
             }
 
             return SimianGetOperation(id);
         }
-        
+
 
         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;
             }
@@ -177,7 +182,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
             // return GetRemoteMetadata(id);
             return SimianGetMetadataOperation(id);
         }
-        
+
         public byte[] GetData(string id)
         {
             if (String.IsNullOrEmpty(m_serverUrl))
@@ -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);
@@ -296,7 +304,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
             return SimianStoreOperation(asset);
         }
-        
+
         /// <summary>
         /// Update an asset's content
         /// </summary>
@@ -344,7 +352,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
             return SimianDeleteOperation(id);
         }
-        
+
 #endregion IAssetService
 
 #region SimianOperations
@@ -369,9 +377,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: failed to delete asset; {0}",response["Message"].AsString());
                     return false;
                 }
-                
+
                 return true;
-                
+
             }
             catch (Exception ex)
             {
@@ -400,7 +408,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                             { "Temporary", asset.Temporary ? "1" : "0" },
                             { "Name", asset.Name }
                     };
-                
+
                 OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
                 if (! response["Success"].AsBoolean())
                 {
@@ -410,13 +418,13 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
                 // asset.ID is always set before calling this function
                 return asset.ID;
-                
+
             }
             catch (Exception ex)
             {
                 m_log.ErrorFormat("[SIMIAN ASSET CONNECTOR] failed to store asset; {0}",ex.Message);
             }
-            
+
             return null;
         }
 
@@ -427,12 +435,12 @@ namespace OpenSim.Services.Connectors.SimianGrid
         /// <returns></returns>
         private AssetBase SimianGetOperation(string id)
         {
-            try 
+            try
             {
                 NameValueCollection requestArgs = new NameValueCollection
                     {
                             { "RequestMethod", "xGetAsset" },
-                            { "ID", id } 
+                            { "ID", id }
                     };
 
                 OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
@@ -441,7 +449,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     m_log.WarnFormat("[SIMIAN ASSET CONNECTOR] Failed to get asset; {0}",response["Message"].AsString());
                     return null;
                 }
-            
+
                 AssetBase asset = new AssetBase();
 
                 asset.ID = id;
@@ -475,7 +483,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                 NameValueCollection requestArgs = new NameValueCollection
                     {
                             { "RequestMethod", "xGetAssetMetadata" },
-                            { "ID", id } 
+                            { "ID", id }
                     };
 
                 OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
@@ -485,7 +493,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
                     // m_log.DebugFormat("[SIMIAN ASSET CONNECTOR] Failed to get asset metadata; {0}",response["Message"].AsString());
                     return null;
                 }
-            
+
                 AssetMetadata metadata = new AssetMetadata();
                 metadata.ID = id;
                 metadata.ContentType = response["ContentType"].AsString();
@@ -620,7 +628,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
         //     }
 
         //     string errorMessage = null;
-            
+
         //     // Build the remote storage request
         //     List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>()
         //     {