aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectors
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-06-01 16:00:46 +0000
committerJustin Clarke Casey2009-06-01 16:00:46 +0000
commitecbeb5cea15e558b1df361dc90f1bf24bbc87152 (patch)
tree50dea4d3ea9b5ab3f71db0c03860de830c1674aa /OpenSim/Region/CoreModules/ServiceConnectors
parentFixed AvatarCreationModule (I think) (diff)
downloadopensim-SC_OLD-ecbeb5cea15e558b1df361dc90f1bf24bbc87152.zip
opensim-SC_OLD-ecbeb5cea15e558b1df361dc90f1bf24bbc87152.tar.gz
opensim-SC_OLD-ecbeb5cea15e558b1df361dc90f1bf24bbc87152.tar.bz2
opensim-SC_OLD-ecbeb5cea15e558b1df361dc90f1bf24bbc87152.tar.xz
* Fix race condition in save oar
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectors')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
index 96366f1..995a47a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectors/Asset/LocalAssetServiceConnector.cs
@@ -196,6 +196,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset
196 public bool Get(string id, Object sender, AssetRetrieved handler) 196 public bool Get(string id, Object sender, AssetRetrieved handler)
197 { 197 {
198 AssetBase asset = null; 198 AssetBase asset = null;
199
199 if (m_Cache != null) 200 if (m_Cache != null)
200 m_Cache.Get(id); 201 m_Cache.Get(id);
201 202
@@ -209,6 +210,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset
209 { 210 {
210 if ((a != null) && (m_Cache != null)) 211 if ((a != null) && (m_Cache != null))
211 m_Cache.Cache(a); 212 m_Cache.Cache(a);
213
212 handler.BeginInvoke(assetID, s, a, null, null); 214 handler.BeginInvoke(assetID, s, a, null, null);
213 }); 215 });
214 } 216 }
@@ -217,8 +219,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectors.Asset
217 { 219 {
218 if (m_Cache != null) 220 if (m_Cache != null)
219 m_Cache.Cache(asset); 221 m_Cache.Cache(asset);
222
220 if (asset.Temporary || asset.Local) 223 if (asset.Temporary || asset.Local)
221 return asset.ID; 224 return asset.ID;
225
222 return m_AssetService.Store(asset); 226 return m_AssetService.Store(asset);
223 } 227 }
224 228