fix to timeout

diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index 0feaf93bbb9bb5a08dd73c43e9dac6d7a09ce2d1..420e4124712ddec7263c17e21b5fd61bbb2b7452 100644 (file)
--- 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()