Query also oldest connection in queue

Author: rPraml

ebean-datasource/src/main/java/io/ebean/datasource/pool/ConnectionBuffer.java

@@ -142,6 +142,13 @@ final class ConnectionBuffer {
     }
   }
 
+  /**
+   * affinity is supported by the buffer.
+   */
+  boolean isAffinitySupported() {
+    return affinityLists != null;
+  }
+
   /**
    * Return the number of free connections.
    */

ebean-datasource/src/main/java/io/ebean/datasource/pool/PooledConnectionQueue.java

@@ -226,15 +226,14 @@ private PooledConnection _obtainConnection(Object affinitiyId) throws Interrupte
           return connection;
         }
         connection = createConnection();
+        if (connection == null && buffer.isAffinitySupported()) {
+          // we could not find connection with required affinity and
+          // buffer is full. So try to get oldest connection from buffer
+          connection = extractFromFreeList(ConnectionBuffer.GET_OLDEST);
+        }
         if (connection != null) {
           return connection;
         }
-        if (affinitiyId != null) {
-          connection = extractFromFreeList(ConnectionBuffer.GET_OLDEST);
-          if (connection != null) {
-            return connection;
-          }
-        }
       }
       try {
         // The pool is at maximum size. We are going to go into
@@ -292,6 +291,9 @@ private PooledConnection _obtainConnectionWaitLoop(Object affinitiyId) throws SQ
       try {
         nanos = notEmpty.awaitNanos(nanos);
         PooledConnection c = extractFromFreeList(affinitiyId);
+        if (c == null && buffer.isAffinitySupported()) {
+          c = extractFromFreeList(ConnectionBuffer.GET_OLDEST);
+        }
         if (c != null) {
           // successfully waited
           return c;