From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 26 Jun 2006 18:27:32 +0000 (+0000)
Subject: fix to timeout
X-Git-Tag: rel_0_2_4~11
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=bd8ee15b87a504c158ddf7b44264e3bdc3cf3d02;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

fix to timeout
---

diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index 0feaf93bbb..420e412471 100644
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -236,7 +236,7 @@ class QueuePool(Pool):
         try:
             return self._pool.get(self._max_overflow > -1 and self._overflow >= self._max_overflow, self._timeout)
         except Queue.Empty:
-            if self._overflow >= self._max_overflow:
+            if self._max_overflow > -1 and self._overflow >= self._max_overflow:
                 raise exceptions.TimeoutError("QueuePool limit of size %d overflow %d reached, connection timed out" % (self.size(), self.overflow()))
             self._overflow += 1
             return self._creator()