add async call template, not sure how it will work, but I will know soon

make sure that timewait is a positive value, 0 being the lowest

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@719711 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
index cec75c8..35e783b 100644 (file)
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
@@ -27,6 +27,8 @@ import java.util.Iterator;
 import java.util.Queue;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.juli.logging.Log;
@@ -109,6 +111,11 @@ public class ConnectionPool {
         init(prop);
     }
 
+
+    public Future<Connection> getConnectionAsync() throws SQLException {
+        return null;
+    }
+    
     /**
      * Borrows a connection from the pool
      * @return Connection - a java.sql.Connection reflection proxy, wrapping the underlying object.
@@ -117,6 +124,10 @@ public class ConnectionPool {
     public Connection getConnection() throws SQLException {
         //check out a connection
         PooledConnection con = (PooledConnection)borrowConnection();
+        return setupConnection(con);
+    }
+
+    protected Connection setupConnection(PooledConnection con) throws SQLException {
         JdbcInterceptor handler = con.getHandler();
         if (handler==null) {
             //build the proxy handler
@@ -164,8 +175,9 @@ public class ConnectionPool {
             s.initCause(x);
             throw s;
         }
-    }
 
+    }
+    
     /**
      * Returns the name of this pool
      * @return String
@@ -394,7 +406,7 @@ public class ConnectionPool {
 
             //calculate wait time for this iteration
             long maxWait = (getPoolProperties().getMaxWait()<=0)?Long.MAX_VALUE:getPoolProperties().getMaxWait();
-            long timetowait = Math.max(1, maxWait - (System.currentTimeMillis() - now));
+            long timetowait = Math.max(0, maxWait - (System.currentTimeMillis() - now));
             try {
                 //retrieve an existing connection
                 con = idle.poll(timetowait, TimeUnit.MILLISECONDS);