--- a/server/session.py	Thu Mar 11 16:49:07 2010 +0100
+++ b/server/session.py	Thu Mar 11 16:49:43 2010 +0100
@@ -569,6 +569,7 @@
                 self.error('thread %s still alive after 10 seconds, will close '
                            'session anyway', thread)
         self.rollback()
+        del self._threaddata
 
     # transaction data/operations management ##################################
 
@@ -767,7 +768,7 @@
 
     def close(self):
         """do not close pool on session close, since they are shared now"""
-        self.rollback()
+        self.parent_session.close()
 
     def user_data(self):
         """returns a dictionnary with this user's information"""