summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-12-06 23:01:08 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2013-12-06 23:01:59 -0500
commit71a9947410a3c32be48a3461e1a90a593c4406cd (patch)
treeb68f53449aa13e48b5f2c58c67aebe955a00c514 /lib/sqlalchemy
parent507a33319f7227a49fff62c4cac7f3f9272e927d (diff)
downloadsqlalchemy-71a9947410a3c32be48a3461e1a90a593c4406cd.tar.gz
- restore having the connection closed before decrementing the overflow counter
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/pool.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index dd00e745e..6bb56478c 100644
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -744,8 +744,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