ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

trying to fix exception with in LLPacketQueue probably caused by

Browse Source 
missing locks where the queue was modified.
This commit is contained in:
Dr Scofield
2009-05-19 18:46:20 +00:00
parent 8559f9bbba
commit 14f0d5e77f
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/ClientStack/LindenUDP/LLPacketQueue.cs
View File

@@ -189,7 +189,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
if (item.Sequence != 0)
contents.Add(item.Sequence);
lock(contents) contents.Add(item.Sequence);
lock (this)
{
@@ -241,7 +241,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
item.TickCount = System.Environment.TickCount;
if (item.Sequence == 0)
return item;
lock (contents)
lock(contents)
{
if (contents.Contains(item.Sequence))
if (contents.Remove(item.Sequence))
@@ -252,13 +252,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void Cancel(uint sequence)
{
while (contents.Remove(sequence))
lock(contents) while (contents.Remove(sequence))
;
}
public bool Contains(uint sequence)
{
return contents.Contains(sequence);
lock(contents) return contents.Contains(sequence);
}
public void Flush()
@@ -318,7 +318,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
TextureOutgoingPacketQueue.Clear();
AssetOutgoingPacketQueue.Clear();
SendQueue.Clear();
contents.Clear();
lock(contents) contents.Clear();
}
}