Kicked unnecessary usedConnections queue + version in Readme.md

Narigo · Narigo · commit 5763e709f537 · 2014-01-16T13:27:05.000+01:00
diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ This Vert.x module uses the https://github.com/mauricio/postgresql-async drivers
 
 ## Installation
 
-`vertx install io.vertx~mod-mysql-postgresql~0.2.0`
+`vertx install io.vertx~mod-mysql-postgresql~0.3.0-SNAPSHOT`
 
 ## Configuration
 
diff --git a/src/main/scala/io/vertx/asyncsql/database/pool/AsyncConnectionPool.scala b/src/main/scala/io/vertx/asyncsql/database/pool/AsyncConnectionPool.scala
@@ -16,7 +16,6 @@ trait AsyncConnectionPool extends VertxExecutionContext {
 
   private var poolSize: Int = 0
   private val availableConnections: Queue[Connection] = Queue.empty
-  private val usedConnections: Queue[Connection] = Queue.empty
   private val waiters: Queue[Promise[Connection]] = Queue.empty
 
   def create(): Future[Connection]
@@ -44,21 +43,15 @@ trait AsyncConnectionPool extends VertxExecutionContext {
     }
   }
 
-  def take(): Future[Connection] = {
-    (availableConnections.dequeueFirst(_ => true) match {
-      case Some(connection) =>
-        if (connection.isConnected) {
-          Future.successful(connection)
-        } else {
-          poolSize -= 1
-          createConnection()
-        }
-      case None =>
-        createOrWaitForAvailableConnection()
-    }) map { c =>
-      usedConnections.enqueue(c)
-      c
-    }
+  def take(): Future[Connection] = availableConnections.dequeueFirst(_ => true) match {
+    case Some(connection) =>
+      if (connection.isConnected) {
+        Future.successful(connection)
+      } else {
+        poolSize -= 1
+        take()
+      }
+    case None => createOrWaitForAvailableConnection()
   }
 
   private def notifyWaitersAboutAvailableConnection(): Future[_] = {
@@ -72,7 +65,6 @@ trait AsyncConnectionPool extends VertxExecutionContext {
   }
 
   def giveBack(conn: Connection)(implicit ec: ExecutionContext) = {
-    usedConnections.dequeueFirst(_ == conn)
     if (conn.isConnected) {
       availableConnections.enqueue(conn)
     } else {
