From b8c8284dc6dfb359b98d17f9f26e67f699abcb71 Mon Sep 17 00:00:00 2001 From: Patrick Gerken Date: Wed, 16 Mar 2016 19:15:11 +0100 Subject: [PATCH] Fixing uncaught exception problem on shutdown Nested connections try to clean up themselves multiple times. This does not work --- doc/HISTORY.rst | 2 ++ src/ZODB/Connection.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/doc/HISTORY.rst b/doc/HISTORY.rst index 5b8c7e00f..b0ce12bb7 100644 --- 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 index 6a2bcb906..743e1c582 100644 --- 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)