Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs

1 files changed, 29 insertions, 39 deletions

diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index 08e7cb7..d510d82 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -365,11 +365,36 @@ namespace OpenSim.Region.CoreModules.Asset
         /// <param name="id"></param>
         /// <returns>An asset retrieved from the file cache.  null if there was a problem retrieving an asset.</returns>
         private AssetBase GetFromFileCache(string id)
-        {
-            AssetBase asset = null;
-           
+        {          
             string filename = GetFileName(id);
-            while (File.Exists(filename))
+
+#if WAIT_ON_INPROGRESS_REQUESTS
+            // Check if we're already downloading this asset.  If so, try to wait for it to
+            // download.
+            if (m_WaitOnInprogressTimeout > 0)
+            {
+                m_RequestsForInprogress++;
+
+                ManualResetEvent waitEvent;
+                if (m_CurrentlyWriting.TryGetValue(filename, out waitEvent))
+                {
+                    waitEvent.WaitOne(m_WaitOnInprogressTimeout);
+                    return Get(id);
+                }
+            }
+#else
+            // Track how often we have the problem that an asset is requested while
+            // it is still being downloaded by a previous request.
+            if (m_CurrentlyWriting.Contains(filename))
+            {
+                m_RequestsForInprogress++;
+                return null;
+            }
+#endif
+
+            AssetBase asset = null;
+
+            if (File.Exists(filename))
             {
                 FileStream stream = null;
                 try
@@ -380,8 +405,6 @@ namespace OpenSim.Region.CoreModules.Asset
                     asset = (AssetBase)bformatter.Deserialize(stream);
 
                     m_DiskHits++;
-
-                    break;
                 }
                 catch (System.Runtime.Serialization.SerializationException e)
                 {
@@ -394,16 +417,6 @@ namespace OpenSim.Region.CoreModules.Asset
                     // {different version of AssetBase} -- we should attempt to
                     // delete it and re-cache
                     File.Delete(filename);
-
-                    break;
-                }
-                catch (IOException e)
-                {
-                    // This is a sharing violation: File exists but can't be opened because it's
-                    // being written
-                    Thread.Sleep(100);
-
-                    continue;
                 }
                 catch (Exception e)
                 {
@@ -411,7 +424,6 @@ namespace OpenSim.Region.CoreModules.Asset
                         "[FLOTSAM ASSET CACHE]: Failed to get file {0} for asset {1}.  Exception {2} {3}",
                         filename, id, e.Message, e.StackTrace);
 
-                    break;
                 }
                 finally
                 {
@@ -420,28 +432,6 @@ namespace OpenSim.Region.CoreModules.Asset
                 }
             }
 
-#if WAIT_ON_INPROGRESS_REQUESTS
-            // Check if we're already downloading this asset.  If so, try to wait for it to
-            // download.
-            if (m_WaitOnInprogressTimeout > 0)
-            {
-                m_RequestsForInprogress++;
-
-                ManualResetEvent waitEvent;
-                if (m_CurrentlyWriting.TryGetValue(filename, out waitEvent))
-                {
-                    waitEvent.WaitOne(m_WaitOnInprogressTimeout);
-                    return Get(id);
-                }
-            }
-#else
-            // Track how often we have the problem that an asset is requested while
-            // it is still being downloaded by a previous request.
-            if (m_CurrentlyWriting.Contains(filename))
-            {
-                m_RequestsForInprogress++;
-            }
-#endif
             return asset;
         }