From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 7 Dec 2013 04:01:08 +0000 (-0500)
Subject: - restore having the connection closed before decrementing the overflow counter
X-Git-Tag: rel_0_9_0~49^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8efeb6c052330b7b8d44960132d638b08d42d18;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- restore having the connection closed before decrementing the overflow counter
---

diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index 20b61746dd..a80fd3c0f0 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