aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorteravus2013-02-14 18:43:53 -0500
committerteravus2013-02-14 18:43:53 -0500
commitc22276a169125e97b39d72c2e9ca55f5e1807320 (patch)
tree18e0308ca02833c83dadea5e054e0effbac6e6a8 /OpenSim
parentAdd regression TestGetArrayLength() (diff)
downloadopensim-SC_OLD-c22276a169125e97b39d72c2e9ca55f5e1807320.zip
opensim-SC_OLD-c22276a169125e97b39d72c2e9ca55f5e1807320.tar.gz
opensim-SC_OLD-c22276a169125e97b39d72c2e9ca55f5e1807320.tar.bz2
opensim-SC_OLD-c22276a169125e97b39d72c2e9ca55f5e1807320.tar.xz
* gracefully handle a Situation where a double close is called on the WebSocket handler
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
index cfb1605..bb8825b 100644
--- a/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
+++ b/OpenSim/Framework/Servers/HttpServer/WebsocketServerHandler.cs
@@ -535,6 +535,8 @@ namespace OpenSim.Framework.Servers.HttpServer
535 /// <param name="message"></param> 535 /// <param name="message"></param>
536 public void Close(string message) 536 public void Close(string message)
537 { 537 {
538 if (_networkContext == null)
539 return;
538 if (_networkContext.Stream != null) 540 if (_networkContext.Stream != null)
539 { 541 {
540 if (_networkContext.Stream.CanWrite) 542 if (_networkContext.Stream.CanWrite)