[SQL-CVS] r558 - trunk/SQLObject/sqlobject

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

Author: ianb
Date: 2005-01-28 21:01:13 +0000 (Fri, 28 Jan 2005)
New Revision: 558

Modified:
   trunk/SQLObject/sqlobject/dbconnection.py
Log:
Clean up getConnection a little -- if we need to make a connection,
don't put it in the pool just to take it out again.


Modified: trunk/SQLObject/sqlobject/dbconnection.py
===================================================================
--- trunk/SQLObject/sqlobject/dbconnection.py	2005-01-28 20:57:05 UTC (rev 557)
+++ trunk/SQLObject/sqlobject/dbconnection.py	2005-01-28 21:01:13 UTC (rev 558)
@@ -131,17 +131,17 @@
         self._poolLock.acquire()
         try:
             if not self._pool:
-                newConn = self.makeConnection()
-                self._pool.append(newConn)
-                self._connectionNumbers[id(newConn)] = self._connectionCount
+                conn = self.makeConnection()
+                self._connectionNumbers[id(conn)] = self._connectionCount
                 self._connectionCount += 1
-            val = self._pool.pop()
+            else:
+                conn = self._pool.pop()
             if self.debug:
                 s = 'ACQUIRE'
                 if self._pool is not None:
                     s += ' pool=[%s]' % ', '.join([str(self._connectionNumbers[id(v)]) for v in self._pool])
-                self.printDebug(val, s, 'Pool')
-            return val
+                self.printDebug(conn, s, 'Pool')
+            return conn
         finally:
             self._poolLock.release()