[SQL-CVS] r4612 - in SQLObject/trunk: docs sqlobject

[<sub...@co...>]

Author: phd
Date: Sun Jul  7 12:45:11 2013
New Revision: 4612

Log:
A bug was fixed in DBConnection.close()

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/dbconnection.py

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Sun May 26 11:17:22 2013	(r4611)
+++ SQLObject/trunk/docs/News.txt	Sun Jul  7 12:45:11 2013	(r4612)
@@ -7,6 +7,12 @@
 
 .. _start:
 
+SQLObject (trunk)
+=================
+
+* A bug was fixed in DBConnection.close(); close() doesn't raise
+  an UnboundLocalError if connection pool is empty.
+
 SQLObject 1.4.1
 ===============
 

Modified: SQLObject/trunk/sqlobject/dbconnection.py
==============================================================================
--- SQLObject/trunk/sqlobject/dbconnection.py	Sun May 26 11:17:22 2013	(r4611)
+++ SQLObject/trunk/sqlobject/dbconnection.py	Sun Jul  7 12:45:11 2013	(r4612)
@@ -682,6 +682,8 @@
             return
         self._poolLock.acquire()
         try:
+            if not self._pool: # _pool could be filled in a different thread
+                return
             conns = self._pool[:]
             self._pool[:] = []
             for conn in conns: