diff options
author | Justin Clarke Casey | 2008-11-06 19:59:59 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-06 19:59:59 +0000 |
commit | 5a852321e0f7ff77dbae0f461349432099209806 (patch) | |
tree | bf2e48ffa5dfb0f776f61bf5081527cb84ac5321 | |
parent | * test: Add assert checking that the circuit which trigger the socket excepti... (diff) | |
download | opensim-SC-5a852321e0f7ff77dbae0f461349432099209806.zip opensim-SC-5a852321e0f7ff77dbae0f461349432099209806.tar.gz opensim-SC-5a852321e0f7ff77dbae0f461349432099209806.tar.bz2 opensim-SC-5a852321e0f7ff77dbae0f461349432099209806.tar.xz |
* Stop passing along epSender explicitly where we are really using the constantly reused ep sender field
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index ffb3d1d..b9da83e 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -305,7 +305,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
305 | { | 305 | { |
306 | try | 306 | try |
307 | { | 307 | { |
308 | CloseCircuit(reusedEpSender, e); | 308 | CloseCircuit(e); |
309 | } | 309 | } |
310 | catch (Exception e2) | 310 | catch (Exception e2) |
311 | { | 311 | { |
@@ -323,19 +323,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
323 | /// Close a client circuit. This is done in response to an exception on receive, and should not be called | 323 | /// Close a client circuit. This is done in response to an exception on receive, and should not be called |
324 | /// normally. | 324 | /// normally. |
325 | /// </summary> | 325 | /// </summary> |
326 | /// <param name="sender"></param> | ||
327 | /// <param name="e">The exception that caused the close. Can be null if there was no exception</param> | 326 | /// <param name="e">The exception that caused the close. Can be null if there was no exception</param> |
328 | private void CloseCircuit(EndPoint sender, Exception e) | 327 | private void CloseCircuit(Exception e) |
329 | { | 328 | { |
330 | uint circuit; | 329 | uint circuit; |
331 | lock (clientCircuits) | 330 | lock (clientCircuits) |
332 | { | 331 | { |
333 | if (clientCircuits.TryGetValue(sender, out circuit)) | 332 | if (clientCircuits.TryGetValue(reusedEpSender, out circuit)) |
334 | { | 333 | { |
335 | m_packetServer.CloseCircuit(circuit); | 334 | m_packetServer.CloseCircuit(circuit); |
336 | 335 | ||
337 | if (e != null) | 336 | if (e != null) |
338 | m_log.ErrorFormat("[CLIENT]: Closed circuit {0} {1} due to exception {2}", circuit, sender, e); | 337 | m_log.ErrorFormat( |
338 | "[CLIENT]: Closed circuit {0} {1} due to exception {2}", circuit, reusedEpSender, e); | ||
339 | } | 339 | } |
340 | } | 340 | } |
341 | } | 341 | } |