Merge branch 'master' into httptests

1 files changed, 14 insertions, 10 deletions

diff --git a/OpenSim/Framework/Cache.cs b/OpenSim/Framework/Cache.cs
index 7ccc320..3ca85d7 100644
--- a/OpenSim/Framework/Cache.cs
+++ b/OpenSim/Framework/Cache.cs
@@ -390,17 +390,21 @@ namespace OpenSim.Framework
 
             Object data = fetch(index);
 
-            if (data == null && (m_Flags & CacheFlags.CacheMissing) == 0)
-                return null;
-
-            lock (m_Index)
+            if (data == null)
             {
-               CacheItemBase missing = new CacheItemBase(index);
-               if (!m_Index.Contains(missing))
-               {
-                   m_Index.Add(missing);
-                   m_Lookup[index] = missing;
-               }
+                if((m_Flags & CacheFlags.CacheMissing) != 0)
+                {
+                    lock (m_Index)
+                    {
+                        CacheItemBase missing = new CacheItemBase(index);
+                        if (!m_Index.Contains(missing))
+                        {
+                            m_Index.Add(missing);
+                            m_Lookup[index] = missing;
+                        }
+                    }
+                }
+                return null;
             }
 
             Store(index, data);