diff -r 3674f249ab1d -r e32964e28a45 server/session.py --- a/server/session.py Thu Jul 24 14:52:16 2014 +0200 +++ b/server/session.py Fri Jul 25 16:24:44 2014 +0200 @@ -532,8 +532,7 @@ def __exit__(self, exctype=None, excvalue=None, tb=None): assert self._open # actually already open assert self._cnxset_count == 0 - self._free_cnxset(ignoremode=True) - self.clear() + self.rollback() self._open = False