Fixed: should release when connection is closed, not at end of request.

zopefoundation · Sep 10, 2013 · a3cbc01 · a3cbc01
1 parent 9843116
commit a3cbc01
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/zc/zodbwsgi/README.rst b/src/zc/zodbwsgi/README.rst
@@ -709,8 +709,6 @@ complete.
     >>> import sys
     >>> def app(environ, start_response):
     ...     print 'about to close'
-    ...     environ['zodb.connection'].onCloseCallback(
-    ...         lambda : sys.stdout.write('close\n'))
     ...     environ['zodb.connection'].close()
     ...     print 'closed'
     ...     start_response('200 OK', [])
@@ -737,9 +735,8 @@ complete.
     acquire
     begin
     about to close
-    close
-    closed
     release
+    closed
 
 Dealing with the occasional long-running requests
 -------------------------------------------------

diff --git a/src/zc/zodbwsgi/__init__.py b/src/zc/zodbwsgi/__init__.py
@@ -127,6 +127,7 @@ def __call__(self, environ, start_response):
                 @conn.onCloseCallback
                 def on_close():
                     closed.append(1)
+                    self.release()
 
                 try:
                     try:
@@ -146,7 +147,8 @@ def on_close():
                     del environ[self.transaction_key]
                     del environ[self.key]
             finally:
-                self.release()
+                if not closed:
+                    self.release()
 
         else:
             try: