]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Fix an exception when connecting with an unsupported WebSocket version.
authorFlorian Diebold <flodiebold@gmail.com>
Sun, 17 Jul 2011 19:16:30 +0000 (21:16 +0200)
committerFlorian Diebold <flodiebold@gmail.com>
Sun, 17 Jul 2011 19:16:30 +0000 (21:16 +0200)
tornado/websocket.py

index 00da861c4534484baf9f12294c56563a2f585e4c..f23da07a202c3f197c8428b8f663f35cfeb3bcf3 100644 (file)
@@ -70,6 +70,7 @@ class WebSocketHandler(tornado.web.RequestHandler):
         tornado.web.RequestHandler.__init__(self, application, request,
                                             **kwargs)
         self.stream = request.connection.stream
+        self.ws_connection = None
 
     def _execute(self, transforms, *args, **kwargs):
         self.open_args = args
@@ -127,8 +128,9 @@ class WebSocketHandler(tornado.web.RequestHandler):
         raise Exception("Method not supported for Web Sockets")
 
     def on_connection_close(self):
-        self.ws_connection.client_terminated = True
-        self.on_close()
+        if self.ws_connection:
+            self.ws_connection.client_terminated = True
+            self.on_close()
 
     def _set_client_terminated(self, value):
         self.ws_connection.client_terminated = value