# HG changeset patch # User Sylvain Thénault # Date 1249082458 -7200 # Node ID de68f84b8f544e24d8a229926e9805b176368f72 # Parent 535bc210f79901397093731e626eb8bb25ce507e R [sql source] cnx._cnx checked in cnx.close, don't do it here diff -r 535bc210f799 -r de68f84b8f54 server/sources/extlite.py --- a/server/sources/extlite.py Sat Aug 01 01:19:26 2009 +0200 +++ b/server/sources/extlite.py Sat Aug 01 01:20:58 2009 +0200 @@ -176,10 +176,9 @@ attached session: release the connection lock if the connection wrapper has a connection set """ - if cnx._cnx is not None: - # reset _cnx to ensure next thread using cnx will get a new - # connection - cnx.close() + # reset _cnx to ensure next thread using cnx will get a new + # connection + cnx.close() def syntax_tree_search(self, session, union, args=None, cachekey=None, varmap=None, debug=0): diff -r 535bc210f799 -r de68f84b8f54 server/sources/native.py --- a/server/sources/native.py Sat Aug 01 01:19:26 2009 +0200 +++ b/server/sources/native.py Sat Aug 01 01:20:58 2009 +0200 @@ -171,8 +171,7 @@ self.get_connection = lambda: ConnectionWrapper(self) self.check_connection = lambda cnx: cnx def pool_reset(cnx): - if cnx._cnx is not None: - cnx.close() + cnx.close() self.pool_reset = pool_reset @property