From 12bfce7b9f1356893e351d13ddd947810c352727 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 18 Jan 2014 00:06:12 +0000
Subject: elminate unnecessary asset != null check in
 FlotsamAssetCache.UpdateFileCache()

Passed in asset is always not null
---
 .../Region/CoreModules/Asset/FlotsamAssetCache.cs  | 97 +++++++++++-----------
 1 file changed, 47 insertions(+), 50 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
index f1fee63..e1aa460 100644
--- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
+++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
@@ -248,70 +248,67 @@ namespace OpenSim.Region.CoreModules.Asset
 
         private void UpdateFileCache(string key, AssetBase asset)
         {
-            // TODO: Spawn this off to some seperate thread to do the actual writing
-            if (asset != null)
-            {
-                string filename = GetFileName(key);
+            string filename = GetFileName(key);
 
-                try
+            try
+            {
+                // If the file is already cached, don't cache it, just touch it so access time is updated
+                if (File.Exists(filename))
                 {
-                    // If the file is already cached, don't cache it, just touch it so access time is updated
-                    if (File.Exists(filename))
+                    // We don't really want to know about sharing
+                    // violations here. If the file is locked, then
+                    // the other thread has updated the time for us.
+                    try
                     {
-                        // We don't really want to know about sharing
-                        // violations here. If the file is locked, then
-                        // the other thread has updated the time for us.
-                        try
+                        lock (m_CurrentlyWriting)
                         {
-                            lock (m_CurrentlyWriting)
-                            {
-                                if (!m_CurrentlyWriting.Contains(filename))
-                                    File.SetLastAccessTime(filename, DateTime.Now);
-                            }
+                            if (!m_CurrentlyWriting.Contains(filename))
+                                File.SetLastAccessTime(filename, DateTime.Now);
                         }
-                        catch
+                    }
+                    catch
+                    {
+                    }
+                } 
+                else 
+                {
+                    // Once we start writing, make sure we flag that we're writing
+                    // that object to the cache so that we don't try to write the 
+                    // same file multiple times.
+                    lock (m_CurrentlyWriting)
+                    {
+#if WAIT_ON_INPROGRESS_REQUESTS
+                        if (m_CurrentlyWriting.ContainsKey(filename))
                         {
+                            return;
                         }
-                    } else {
-
-                        // Once we start writing, make sure we flag that we're writing
-                        // that object to the cache so that we don't try to write the 
-                        // same file multiple times.
-                        lock (m_CurrentlyWriting)
+                        else
                         {
-#if WAIT_ON_INPROGRESS_REQUESTS
-                            if (m_CurrentlyWriting.ContainsKey(filename))
-                            {
-                                return;
-                            }
-                            else
-                            {
-                                m_CurrentlyWriting.Add(filename, new ManualResetEvent(false));
-                            }
+                            m_CurrentlyWriting.Add(filename, new ManualResetEvent(false));
+                        }
 
 #else
-                            if (m_CurrentlyWriting.Contains(filename))
-                            {
-                                return;
-                            }
-                            else
-                            {
-                                m_CurrentlyWriting.Add(filename);
-                            }
-#endif
-
+                        if (m_CurrentlyWriting.Contains(filename))
+                        {
+                            return;
                         }
+                        else
+                        {
+                            m_CurrentlyWriting.Add(filename);
+                        }
+#endif
 
-                        Util.FireAndForget(
-                            delegate { WriteFileCache(filename, asset); });
                     }
+
+                    Util.FireAndForget(
+                        delegate { WriteFileCache(filename, asset); });
                 }
-                catch (Exception e)
-                {
-                    m_log.ErrorFormat(
-                        "[FLOTSAM ASSET CACHE]: Failed to update cache for asset {0}.  Exception {1} {2}",
-                        asset.ID, e.Message, e.StackTrace);
-                }
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat(
+                    "[FLOTSAM ASSET CACHE]: Failed to update cache for asset {0}.  Exception {1} {2}",
+                    asset.ID, e.Message, e.StackTrace);
             }
         }
 
-- 
cgit v1.1