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

we can't allow abort to change only one dic

0.9.0-post-fixes
UbitUmarov 2017-05-13 16:34:29 +01:00
parent 9ea49d107d
commit 16f02cb6fd
1 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
OpenSim/Framework/DoubleDictionaryThreadAbortSafe.cs
View File

@ -74,21 +74,19 @@ namespace OpenSim.Framework
{ {
rwLock.EnterWriteLock(); rwLock.EnterWriteLock();
gotLock = true; gotLock = true;
if (Dictionary1.ContainsKey(key1))
{
if (!Dictionary2.ContainsKey(key2))
throw new ArgumentException("key1 exists in the dictionary but not key2");
}
else if (Dictionary2.ContainsKey(key2))
{
if (!Dictionary1.ContainsKey(key1))
throw new ArgumentException("key2 exists in the dictionary but not key1");
}
Dictionary1[key1] = value;
Dictionary2[key2] = value;
} }
if (Dictionary1.ContainsKey(key1))
{
if (!Dictionary2.ContainsKey(key2))
throw new ArgumentException("key1 exists in the dictionary but not key2");
}
else if (Dictionary2.ContainsKey(key2))
{
if (!Dictionary1.ContainsKey(key1))
throw new ArgumentException("key2 exists in the dictionary but not key1");
}
Dictionary1[key1] = value;
Dictionary2[key2] = value;
} }
finally finally
{ {
@ -112,10 +110,9 @@ namespace OpenSim.Framework
{ {
rwLock.EnterWriteLock(); rwLock.EnterWriteLock();
gotLock = true; gotLock = true;
Dictionary1.Remove(key1);
success = Dictionary2.Remove(key2);
} }
Dictionary1.Remove(key1);
success = Dictionary2.Remove(key2);
} }
finally finally
{ {
@ -151,8 +148,12 @@ namespace OpenSim.Framework
{ {
if (kvp.Value.Equals(value)) if (kvp.Value.Equals(value))
{ {
Dictionary1.Remove(key1); try { }
Dictionary2.Remove(kvp.Key); finally
{
Dictionary1.Remove(key1);
Dictionary2.Remove(kvp.Key);
}
found = true; found = true;
break; break;
} }
@ -193,8 +194,12 @@ namespace OpenSim.Framework
{ {
if (kvp.Value.Equals(value)) if (kvp.Value.Equals(value))
{ {
Dictionary2.Remove(key2); try { }
Dictionary1.Remove(kvp.Key); finally
{
Dictionary2.Remove(key2);
Dictionary1.Remove(kvp.Key);
}
found = true; found = true;
break; break;
} }
@ -224,10 +229,9 @@ namespace OpenSim.Framework
{ {
rwLock.EnterWriteLock(); rwLock.EnterWriteLock();
gotLock = true; gotLock = true;
Dictionary1.Clear();
Dictionary2.Clear();
} }
Dictionary1.Clear();
Dictionary2.Clear();
} }
finally finally
{ {
@ -487,13 +491,13 @@ namespace OpenSim.Framework
{ {
rwLock.EnterWriteLock(); rwLock.EnterWriteLock();
gotWriteLock = true; gotWriteLock = true;
for (int i = 0; i < list.Count; i++)
Dictionary1.Remove(list[i]);
for (int i = 0; i < list2.Count; i++)
Dictionary2.Remove(list2[i]);
} }
for (int i = 0; i < list.Count; i++)
Dictionary1.Remove(list[i]);
for (int i = 0; i < list2.Count; i++)
Dictionary2.Remove(list2[i]);
} }
finally finally
{ {