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

Add some nullref checks to the UnackedPacketCollection.

avinationmerge
meta7 2010-08-07 08:06:41 -07:00
parent b58a47c373
commit b017d985ab
1 changed files with 184 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
View File

@ -139,14 +139,27 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private void ProcessQueues() private void ProcessQueues()
{ {
// Process all the pending adds // Process all the pending adds
OutgoingPacket pendingAdd; OutgoingPacket pendingAdd;
if (m_pendingAdds != null)
{
while (m_pendingAdds.Dequeue(out pendingAdd)) while (m_pendingAdds.Dequeue(out pendingAdd))
{
if (pendingAdd != null && m_packets != null)
{
m_packets[pendingAdd.SequenceNumber] = pendingAdd; m_packets[pendingAdd.SequenceNumber] = pendingAdd;
}
}
}
// Process all the pending removes, including updating statistics and round-trip times // Process all the pending removes, including updating statistics and round-trip times
PendingAck pendingRemove; PendingAck pendingRemove;
OutgoingPacket ackedPacket; OutgoingPacket ackedPacket;
if (m_pendingRemoves != null)
{
while (m_pendingRemoves.Dequeue(out pendingRemove)) while (m_pendingRemoves.Dequeue(out pendingRemove))
{
if (m_pendingRemoves != null && m_packets != null)
{ {
if (m_packets.TryGetValue(pendingRemove.SequenceNumber, out ackedPacket)) if (m_packets.TryGetValue(pendingRemove.SequenceNumber, out ackedPacket))
{ {
@ -166,4 +179,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
} }
} }
}
}
} }