OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into httptests

httptests
UbitUmarov 2017-08-29 07:53:34 +01:00
parent e4747b938b 22c7450363
commit d4a3aa5e08
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Framework/Cache.cs
View File

@ -390,9 +390,10 @@ namespace OpenSim.Framework
Object data = fetch(index); Object data = fetch(index);
if (data == null && (m_Flags & CacheFlags.CacheMissing) == 0) if (data == null)
return null; {
if((m_Flags & CacheFlags.CacheMissing) != 0)
{
lock (m_Index) lock (m_Index)
{ {
CacheItemBase missing = new CacheItemBase(index); CacheItemBase missing = new CacheItemBase(index);
@ -402,6 +403,9 @@ namespace OpenSim.Framework
m_Lookup[index] = missing; m_Lookup[index] = missing;
} }
} }
}
return null;
}
Store(index, data); Store(index, data);
return data; return data;