Merge lp:~cedric-lebrouster/openobject-server/7.0-bug-1322191-db_maxconn into lp:openobject-server/7.0

Proposed by Cedric Le Brouster(OpenFire)
Status: Needs review
Proposed branch: lp:~cedric-lebrouster/openobject-server/7.0-bug-1322191-db_maxconn
Merge into: lp:openobject-server/7.0
Diff against target: 12 lines (+2/-0)
1 file modified
openerp/sql_db.py (+2/-0)
To merge this branch: bzr merge lp:~cedric-lebrouster/openobject-server/7.0-bug-1322191-db_maxconn
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+220665@code.launchpad.net

Description of the change

Close database connections before removing them.
Fixes bug lp:1322191

To post a comment you must log in.

Unmerged revisions

5308. By Cedric Le Brouster(OpenFire)

[FIX] sql_db: close db connexions before removing them. bug-1322191

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/sql_db.py'
2--- openerp/sql_db.py 2014-04-09 15:16:59 +0000
3+++ openerp/sql_db.py 2014-05-22 14:48:45 +0000
4@@ -430,6 +430,8 @@
5 for i, (cnx, used) in enumerate(self._connections):
6 if not used:
7 self._connections.pop(i)
8+ if not cnx.closed:
9+ cnx.close()
10 self._debug('Removing old connection at index %d: %r', i, cnx.dsn)
11 break
12 else: