diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-12-06 23:01:29 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-12-06 23:01:29 -0500 |
| commit | 181470e78fffc43690e9ffa7360273bb07a299f1 (patch) | |
| tree | 2951ef95ab525e26923464a6784ce2ed1a6044ee | |
| parent | b1e55723c0fa7b5ef20d0e5979f7718b37769791 (diff) | |
| parent | a8efeb6c052330b7b8d44960132d638b08d42d18 (diff) | |
| download | sqlalchemy-181470e78fffc43690e9ffa7360273bb07a299f1.tar.gz | |
Merge branch 'master' into rel_0_9
| -rw-r--r-- | lib/sqlalchemy/pool.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py index 20b61746d..a80fd3c0f 100644 --- a/lib/sqlalchemy/pool.py +++ b/lib/sqlalchemy/pool.py @@ -771,8 +771,10 @@ class QueuePool(Pool): try: self._pool.put(conn, False) except sqla_queue.Full: - self._dec_overflow() - conn.close() + try: + conn.close() + finally: + self._dec_overflow() def _do_get(self): use_overflow = self._max_overflow > -1 |