Merge lp:~stefan-opener/therp-backports/7.0-rstcnx-chs into lp:therp-backports/server-6.1

[Stefan Rijnhart (Opener)]

[RFR] improved previous fix for lp:905257 in rev. 4298

Previous fix for lp:905257 has already been refactored+merged again. See https://code.launchpad.net/~openerp-dev/openobject-server/7.0-rstcnx-chs/+merge/148848

=== modified file 'openerp/sql_db.py'
--- openerp/sql_db.py	2013-02-15 16:01:58 +0000
+++ openerp/sql_db.py	2013-02-16 11:11:22 +0000
@@ -388,14 +388,6 @@
 
         # free dead and leaked connections
         for i, (cnx, _) in tools.reverse_enumerate(self._connections):
-            try:
-                cnx.reset()
-            except psycopg2.OperationalError:
-                self._debug('Cannot reset connection at index %d: %r', i, cnx.dsn)
-                # psycopg2 2.4.4 and earlier do not allow closing a closed connection
-                if not cnx.closed:
-                    cnx.close()
-
             if cnx.closed:
                 self._connections.pop(i)
                 self._debug('Removing closed connection at index %d: %r', i, cnx.dsn)
@@ -409,6 +401,14 @@
         for i, (cnx, used) in enumerate(self._connections):
             if not used and dsn_are_equals(cnx.dsn, dsn):
                 self._connections.pop(i)
+                try:
+                    cnx.reset()
+                except psycopg2.OperationalError:
+                    self._debug('Cannot reset connection at index %d: %r, removing it', i, cnx.dsn)
+                    # psycopg2 2.4.4 and earlier do not allow closing a closed connection
+                    if not cnx.closed:
+                        cnx.close()
+                    continue
                 self._connections.append((cnx, True))
                 self._debug('Existing connection found at index %d', i)