From: Ben Darnell <ben@bendarnell.com>
Date: Wed, 24 Apr 2013 03:17:24 +0000 (-0400)
Subject: Don't try to run HTTPConnection._close_callback if it is None.
X-Git-Tag: v3.1.0~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=549168518f3d24c6cbf65499d2734e321e306401;p=thirdparty%2Ftornado.git

Don't try to run HTTPConnection._close_callback if it is None.

This was the case for WSGIContainer.

Closes #751.
---

diff --git a/tornado/httpserver.py b/tornado/httpserver.py
index f597737a0..396cd15aa 100644
--- a/tornado/httpserver.py
+++ b/tornado/httpserver.py
@@ -212,9 +212,10 @@ class HTTPConnection(object):
         self.stream.set_close_callback(self._on_connection_close)
 
     def _on_connection_close(self):
-        callback = self._close_callback
-        self._close_callback = None
-        callback()
+        if self._close_callback is not None:
+            callback = self._close_callback
+            self._close_callback = None
+            callback()
         # Delete any unfinished callbacks to break up reference cycles.
         self._header_callback = None
         self._clear_callbacks()