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

* Stop passing along epSender explicitly where we are really using the constantly reused ep sender field

0.6.0-stable
Justin Clarke Casey 2008-11-06 19:59:59 +00:00
parent 427a80bba5
commit 5a852321e0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -305,7 +305,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
try try
{ {
CloseCircuit(reusedEpSender, e); CloseCircuit(e);
} }
catch (Exception e2) catch (Exception e2)
{ {
@ -323,19 +323,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// Close a client circuit. This is done in response to an exception on receive, and should not be called /// Close a client circuit. This is done in response to an exception on receive, and should not be called
/// normally. /// normally.
/// </summary> /// </summary>
/// <param name="sender"></param>
/// <param name="e">The exception that caused the close. Can be null if there was no exception</param> /// <param name="e">The exception that caused the close. Can be null if there was no exception</param>
private void CloseCircuit(EndPoint sender, Exception e) private void CloseCircuit(Exception e)
{ {
uint circuit; uint circuit;
lock (clientCircuits) lock (clientCircuits)
{ {
if (clientCircuits.TryGetValue(sender, out circuit)) if (clientCircuits.TryGetValue(reusedEpSender, out circuit))
{ {
m_packetServer.CloseCircuit(circuit); m_packetServer.CloseCircuit(circuit);
if (e != null) if (e != null)
m_log.ErrorFormat("[CLIENT]: Closed circuit {0} {1} due to exception {2}", circuit, sender, e); m_log.ErrorFormat(
"[CLIENT]: Closed circuit {0} {1} due to exception {2}", circuit, reusedEpSender, e);
} }
} }
} }