Fixing uncaught exception problem on shutdown

Nested connections try to clean up themselves multiple times. This does not work
zopefoundation · Mar 17, 2016 · b8c8284 · b8c8284
1 parent d15abe8
commit b8c8284
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/doc/HISTORY.rst b/doc/HISTORY.rst
@@ -1,6 +1,8 @@
 Historical ZODB Changelog
 #########################
 
+- Cleanup of nested mvcc connections could have failed.
+
 3.10.5 (2011-11-19)
 ===================
 

diff --git a/src/ZODB/Connection.py b/src/ZODB/Connection.py
@@ -1085,7 +1085,8 @@ def _resetCache(self):
     def _release_resources(self):
         for c in six.itervalues(self.connections):
             if c._mvcc_storage:
-                c._storage.release()
+                if c._storage is not None:
+                    c._storage.release()
             c._storage = c._normal_storage = None
             c._cache = PickleCache(self, 0, 0)