--- a/server/pool.py Mon Jun 08 20:34:28 2009 +0200
+++ b/server/pool.py Mon Jun 08 20:35:26 2009 +0200
@@ -68,11 +68,11 @@
# internals ###############################################################
- def pool_set(self, session):
+ def pool_set(self):
"""pool is being set"""
self.check_connections()
- def pool_reset(self, session):
+ def pool_reset(self):
"""pool is being reseted"""
for source, cnx in self.source_cnxs.values():
source.pool_reset(cnx)
--- a/server/session.py Mon Jun 08 20:34:28 2009 +0200
+++ b/server/session.py Mon Jun 08 20:35:26 2009 +0200
@@ -159,7 +159,7 @@
# get pool first to avoid race-condition
self._threaddata.pool = self.repo._get_pool()
try:
- self._threaddata.pool.pool_set(self)
+ self._threaddata.pool.pool_set()
except:
self._threaddata.pool = None
self.repo._free_pool(self.pool)
@@ -176,7 +176,7 @@
# even in read mode, we must release the current transaction
pool = self.pool
self._threads_in_transaction.remove(threading.currentThread())
- pool.pool_reset(self)
+ pool.pool_reset()
self._threaddata.pool = None
# free pool once everything is done to avoid race-condition
self.repo._free_pool(pool)