Setting svn:keywords (Author Date Id Revision) and
authorrjung <rjung@13f79535-47bb-0310-9956-ffa450edef68>
Mon, 3 Nov 2008 22:38:55 +0000 (22:38 +0000)
committerrjung <rjung@13f79535-47bb-0310-9956-ffa450edef68>
Mon, 3 Nov 2008 22:38:55 +0000 (22:38 +0000)
svn:eol-style (native) for the jdbc-pool module.

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

18 files changed:
modules/jdbc-pool/.classpath
modules/jdbc-pool/.project
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSource.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/Driver.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java
modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/CheckOutThreadTest.java
modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultProperties.java
modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/DefaultTestCase.java
modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestGCClose.java
modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestTimeout.java

index 3303565..93157c3 100644 (file)
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" path="java"/>\r
-       <classpathentry kind="src" path="test"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
-       <classpathentry kind="var" path="TOMCAT_LIBS_BASE/tomcat6-deps/dbcp/tomcat-dbcp.jar"/>\r
-       <classpathentry kind="var" path="TOMCAT_LIBS_BASE"/>\r
-       <classpathentry combineaccessrules="false" kind="src" path="/tomcat-trunk"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>\r
-       <classpathentry kind="output" path="bin"/>\r
-</classpath>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+       <classpathentry kind="src" path="java"/>
+       <classpathentry kind="src" path="test"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+       <classpathentry kind="var" path="TOMCAT_LIBS_BASE/tomcat6-deps/dbcp/tomcat-dbcp.jar"/>
+       <classpathentry kind="var" path="TOMCAT_LIBS_BASE"/>
+       <classpathentry combineaccessrules="false" kind="src" path="/tomcat-trunk"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+       <classpathentry kind="output" path="bin"/>
+</classpath>
index a8823f0..207e707 100644 (file)
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>tomcat-jdbc-pool</name>\r
-       <comment></comment>\r
-       <projects>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.jdt.core.javanature</nature>\r
-       </natures>\r
-</projectDescription>\r
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>tomcat-jdbc-pool</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.jdt.core.javanature</nature>
+       </natures>
+</projectDescription>
index e66355a..472f7dd 100644 (file)
-/*\r
- * Licensed to the Apache Software Foundation (ASF) under one or more\r
- * contributor license agreements.  See the NOTICE file distributed with\r
- * this work for additional information regarding copyright ownership.\r
- * The ASF licenses this file to You under the Apache License, Version 2.0\r
- * (the "License"); you may not use this file except in compliance with\r
- * the License.  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.apache.tomcat.jdbc.pool;\r
-\r
-import java.lang.management.ManagementFactory;\r
-import java.lang.reflect.Constructor;\r
-import java.lang.reflect.InvocationHandler;\r
-import java.lang.reflect.Proxy;\r
-import java.sql.Connection;\r
-import java.sql.SQLException;\r
-import java.util.ConcurrentModificationException;\r
-import java.util.Iterator;\r
-import java.util.Queue;\r
-import java.util.concurrent.ArrayBlockingQueue;\r
-import java.util.concurrent.BlockingQueue;\r
-import java.util.concurrent.TimeUnit;\r
-\r
-import org.apache.juli.logging.Log;\r
-import org.apache.juli.logging.LogFactory;\r
-\r
-import org.apache.tomcat.jdbc.pool.jmx.ConnectionPoolMBean;\r
-\r
-import java.util.concurrent.atomic.AtomicInteger;\r
-\r
-import javax.management.InstanceAlreadyExistsException;\r
-import javax.management.MBeanRegistrationException;\r
-import javax.management.MBeanServer;\r
-import javax.management.MalformedObjectNameException;\r
-import javax.management.NotCompliantMBeanException;\r
-import javax.management.ObjectName;\r
-\r
-/**\r
- * @author Filip Hanik\r
- * @version 1.0\r
- */\r
-\r
-public class ConnectionPool {\r
-\r
-    //logger\r
-    protected static Log log = LogFactory.getLog(ConnectionPool.class);\r
-\r
-    //===============================================================================\r
-    //         INSTANCE/QUICK ACCESS VARIABLE\r
-    //===============================================================================\r
-\r
-    /**\r
-     * All the information about the connection pool\r
-     */\r
-    protected PoolProperties poolProperties;\r
-\r
-    /**\r
-     * Contains all the connections that are in use\r
-     * TODO - this shouldn't be a blocking queue, simply a list to hold our objects\r
-     */\r
-    protected BlockingQueue<PooledConnection> busy;\r
-\r
-    /**\r
-     * Contains all the idle connections\r
-     */\r
-    protected BlockingQueue<PooledConnection> idle;\r
-\r
-    /**\r
-     * The thread that is responsible for checking abandoned and idle threads\r
-     */\r
-    protected PoolCleaner poolCleaner;\r
-\r
-    /**\r
-     * Pool closed flag\r
-     */\r
-    protected boolean closed = false;\r
-\r
-    /**\r
-     * Size of the pool\r
-     */\r
-    protected AtomicInteger size = new AtomicInteger(0);\r
-\r
-    /**\r
-     * Since newProxyInstance performs the same operation, over and over\r
-     * again, it is much more optimized if we simply store the constructor ourselves.\r
-     */\r
-    protected Constructor proxyClassConstructor;\r
-\r
-\r
-    //===============================================================================\r
-    //         PUBLIC METHODS\r
-    //===============================================================================\r
-\r
-    /**\r
-     * Instantiate a connection pool. This will create connections if initialSize is larger than 0\r
-     * @param prop PoolProperties - all the properties for this connection pool\r
-     * @throws SQLException\r
-     */\r
-    public ConnectionPool(PoolProperties prop) throws SQLException {\r
-        //setup quick access variables and pools\r
-        init(prop);\r
-    }\r
-\r
-    /**\r
-     * Borrows a connection from the pool\r
-     * @return Connection - a java.sql.Connection reflection proxy, wrapping the underlying object.\r
-     * @throws SQLException\r
-     */\r
-    public Connection getConnection() throws SQLException {\r
-        //check out a connection\r
-        PooledConnection con = (PooledConnection)borrowConnection();\r
-        JdbcInterceptor handler = con.getHandler();\r
-        if (handler==null) {\r
-            //build the proxy handler\r
-            handler = new ProxyConnection(this,con);\r
-            //set up the interceptor chain\r
-            String[] proxies = getPoolProperties().getJdbcInterceptorsAsArray();\r
-            for (int i=proxies.length-1; i>=0; i--) {\r
-                try {\r
-                    JdbcInterceptor interceptor =\r
-                        (JdbcInterceptor) Class.forName(proxies[i], true,\r
-                                Thread.currentThread().getContextClassLoader()).newInstance();\r
-                    interceptor.setNext(handler);\r
-                    handler = interceptor;\r
-                }catch(Exception x) {\r
-                    SQLException sx = new SQLException("Unable to instantiate interceptor chain.");\r
-                    sx.initCause(x);\r
-                    throw sx;\r
-                }\r
-            }\r
-            //cache handler for the next iteration\r
-            con.setHandler(handler);\r
-        } else {\r
-            JdbcInterceptor next = handler;\r
-            //we have a cached handler, reset it\r
-            while (next!=null) {\r
-                next.reset(this, con);\r
-                next = next.getNext();\r
-            }\r
-        }\r
-\r
-        try {\r
-            //cache the constructor\r
-            if (proxyClassConstructor == null ) {\r
-                Class proxyClass = Proxy.getProxyClass(ConnectionPool.class.getClassLoader(), new Class[] {java.sql.Connection.class});\r
-                proxyClassConstructor = proxyClass.getConstructor(new Class[] { InvocationHandler.class });\r
-            }\r
-            //create the proxy\r
-            //TODO possible optimization, keep track if this connection was returned properly, and don't generate a new facade\r
-            Connection connection = (Connection)proxyClassConstructor.newInstance(new Object[] { handler });\r
-            //return the connection\r
-            return connection;\r
-        }catch (Exception x) {\r
-            throw new SQLException();\r
-        }\r
-    }\r
-\r
-    /**\r
-     * Returns the name of this pool\r
-     * @return String\r
-     */\r
-    public String getName() {\r
-        return getPoolProperties().getPoolName();\r
-    }\r
-\r
-    /**\r
-     * Returns the pool properties associated with this connection pool\r
-     * @return PoolProperties\r
-     */\r
-    public PoolProperties getPoolProperties() {\r
-        return this.poolProperties;\r
-    }\r
-\r
-    /**\r
-     * Returns the total size of this pool, this includes both busy and idle connections\r
-     * @return int\r
-     */\r
-    public int getSize() {\r
-        return idle.size()+busy.size();\r
-    }\r
-\r
-    /**\r
-     * Returns the number of connections that are in use\r
-     * @return int\r
-     */\r
-    public int getActive() {\r
-        return busy.size();\r
-    }\r
-\r
-    public int getIdle() {\r
-        return idle.size();\r
-    }\r
-\r
-    /**\r
-     * Returns true if {@link #close close} has been called, and the connection pool is unusable\r
-     * @return boolean\r
-     */\r
-    public  boolean isClosed() {\r
-        return this.closed;\r
-    }\r
-\r
-    @Override\r
-    protected void finalize() throws Throwable {\r
-        close(true);\r
-    }\r
-\r
-    /**\r
-     * Closes the pool and all disconnects all idle connections\r
-     * Active connections will be closed upon the {@link java.sql.Connection#close close} method is called\r
-     * on the underlying connection instead of being returned to the pool\r
-     * @param force - true to even close the active connections\r
-     */\r
-    protected void close(boolean force) {\r
-        //are we already closed\r
-        if (this.closed) return;\r
-        //prevent other threads from entering\r
-        this.closed = true;\r
-        //stop background thread\r
-        if (poolCleaner!=null) {\r
-            poolCleaner.stopRunning();\r
-        }\r
-\r
-        /* release all idle connections */\r
-        BlockingQueue<PooledConnection> pool = (idle.size()>0)?idle:(force?busy:idle);\r
-        while (pool.size()>0) {\r
-            try {\r
-                //retrieve the next connection\r
-                PooledConnection con = pool.poll(1000, TimeUnit.MILLISECONDS);\r
-                //close it and retrieve the next one, if one is available\r
-                while (con != null) {\r
-                    //close the connection\r
-                    if (pool==idle)\r
-                        release(con);\r
-                    else\r
-                        abandon(con);\r
-                    con = pool.poll(1000, TimeUnit.MILLISECONDS);\r
-                } //while\r
-            } catch (InterruptedException ex) {\r
-                Thread.currentThread().interrupted();\r
-            }\r
-            if (pool.size()==0 && force && pool!=busy) pool = busy;\r
-        }\r
-        size.set(0);\r
-        if (this.getPoolProperties().isJmxEnabled()) stopJmx();\r
-    } //closePool\r
-\r
-\r
-    //===============================================================================\r
-    //         PROTECTED METHODS\r
-    //===============================================================================\r
-    /**\r
-     * Initialize the connection pool - called from the constructor\r
-     * @param properties PoolProperties - properties used to initialize the pool with\r
-     * @throws SQLException\r
-     */\r
-    protected void init (PoolProperties properties) throws SQLException {\r
-        poolProperties = properties;\r
-        //make space for 10 extra in case we flow over a bit\r
-        busy = new ArrayBlockingQueue<PooledConnection>(properties.getMaxActive(),false);\r
-        //busy = new FairBlockingQueue<PooledConnection>();\r
-        //make space for 10 extra in case we flow over a bit\r
-        if (properties.isFairQueue()) {\r
-            idle = new FairBlockingQueue<PooledConnection>();\r
-        } else {\r
-            idle = new ArrayBlockingQueue<PooledConnection>(properties.getMaxActive(),properties.isFairQueue());\r
-        }\r
-\r
-        //if the evictor thread is supposed to run, start it now\r
-        if (properties.isPoolSweeperEnabled()) {\r
-            poolCleaner = new PoolCleaner("[Pool-Cleaner]:" + properties.getName(), this, properties.getTimeBetweenEvictionRunsMillis());\r
-            poolCleaner.start();\r
-        } //end if\r
-\r
-        if (properties.getMaxActive()<properties.getInitialSize()) {\r
-            log.warn("initialSize is larger than maxActive, setting initialSize to: "+properties.getMaxActive());\r
-            properties.setInitialSize(properties.getMaxActive());\r
-        }\r
-        if (properties.getMinIdle()>properties.getMaxActive()) {\r
-            log.warn("minIdle is larger than maxActive, setting minIdle to: "+properties.getMaxActive());\r
-            properties.setMinIdle(properties.getMaxActive());\r
-        }\r
-        if (properties.getMaxIdle()>properties.getMaxActive()) {\r
-            log.warn("maxIdle is larger than maxActive, setting maxIdle to: "+properties.getMaxActive());\r
-            properties.setMaxIdle(properties.getMaxActive());\r
-        }\r
-        if (properties.getMaxIdle()<properties.getMinIdle()) {\r
-            log.warn("maxIdle is smaller than minIdle, setting maxIdle to: "+properties.getMinIdle());\r
-            properties.setMaxIdle(properties.getMinIdle());\r
-        }\r
-\r
-\r
-        //initialize the pool with its initial set of members\r
-        PooledConnection[] initialPool = new PooledConnection[poolProperties.getInitialSize()];\r
-        try {\r
-            for (int i = 0; i < initialPool.length; i++) {\r
-                initialPool[i] = this.borrowConnection();\r
-            } //for\r
-\r
-        } catch (SQLException x) {\r
-            close(true);\r
-            throw x;\r
-        } finally {\r
-            //return the members as idle to the pool\r
-            for (int i = 0; i < initialPool.length; i++) {\r
-                if (initialPool[i] != null) {\r
-                    try {this.returnConnection(initialPool[i]);}catch(Exception x){}\r
-                } //end if\r
-            } //for\r
-        } //catch\r
-        if (this.getPoolProperties().isJmxEnabled()) startJmx();\r
-        closed = false;\r
-    }\r
-\r
-\r
-//===============================================================================\r
-//         CONNECTION POOLING IMPL\r
-//===============================================================================\r
-\r
-    /**\r
-     * thread safe way to abandon a connection\r
-     * signals a connection to be abandoned.\r
-     * this will disconnect the connection, and log the stack trace if logAbanded=true\r
-     * @param con PooledConnection\r
-     */\r
-    protected void abandon(PooledConnection con) {\r
-        if (con == null)\r
-            return;\r
-        try {\r
-            con.lock();\r
-            if (getPoolProperties().isLogAbandoned()) {\r
-                log.warn("Connection has been abandoned " + con + ":" +con.getStackTrace());\r
-            }\r
-            con.abandon();\r
-        } finally {\r
-            con.unlock();\r
-        }\r
-    }\r
-\r
-    /**\r
-     * thread safe way to release a connection\r
-     * @param con PooledConnection\r
-     */\r
-    protected void release(PooledConnection con) {\r
-        if (con == null)\r
-            return;\r
-        try {\r
-            con.lock();\r
-            con.release();\r
-        } finally {\r
-            con.unlock();\r
-        }\r
-    }\r
-\r
-    /**\r
-     * Thread safe way to retrieve a connection from the pool\r
-     * @return PooledConnection\r
-     * @throws SQLException\r
-     */\r
-    protected PooledConnection borrowConnection() throws SQLException {\r
-\r
-        if (isClosed()) {\r
-            throw new SQLException("Connection pool closed.");\r
-        } //end if\r
-\r
-        //get the current time stamp\r
-        long now = System.currentTimeMillis();\r
-        //see if there is one available immediately\r
-        PooledConnection con = idle.poll();\r
-\r
-        while (true) {\r
-            if (con!=null) {\r
-                PooledConnection result = borrowConnection(now, con);\r
-                //validation might have failed, in which case null is returned\r
-                if (result!=null) return result;\r
-            }\r
-            if (size.get() < getPoolProperties().getMaxActive()) {\r
-                if (size.addAndGet(1) <= getPoolProperties().getMaxActive()) {\r
-                    return createConnection(now, con);\r
-                } else {\r
-                    size.addAndGet(-1); //restore the value, we didn't create a connection\r
-                }\r
-            } //end if\r
-\r
-            //calculate wait time for this iteration\r
-            long maxWait = (getPoolProperties().getMaxWait()<=0)?Long.MAX_VALUE:getPoolProperties().getMaxWait();\r
-            long timetowait = Math.max(1, maxWait - (System.currentTimeMillis() - now));\r
-            try {\r
-                //retrieve an existing connection\r
-                con = idle.poll(timetowait, TimeUnit.MILLISECONDS);\r
-            } catch (InterruptedException ex) {\r
-                Thread.currentThread().interrupted();\r
-            }\r
-            //we didn't get a connection, lets see if we timed out\r
-            if (con == null) {\r
-                if ((System.currentTimeMillis() - now) >= maxWait) {\r
-                    throw new SQLException(\r
-                        "Pool empty. Unable to fetch a connection in " + (maxWait / 1000) +\r
-                        " seconds, none available["+busy.size()+" in use].");\r
-                } else {\r
-                    //no timeout, lets try again\r
-                    continue;\r
-                }\r
-            }\r
-        } //while\r
-    }\r
-\r
-    protected PooledConnection createConnection(long now, PooledConnection con) {\r
-        //no connections where available we'll create one\r
-        boolean error = false;\r
-        try {\r
-            //connect and validate the connection\r
-            con = create();\r
-            con.lock();\r
-            con.connect();\r
-            if (con.validate(PooledConnection.VALIDATE_INIT)) {\r
-                //no need to lock a new one, its not contented\r
-                con.setTimestamp(now);\r
-                if (getPoolProperties().isLogAbandoned()) {\r
-                    con.setStackTrace(getThreadDump());\r
-                }\r
-                if (!busy.offer(con)) {\r
-                    log.debug("Connection doesn't fit into busy array, connection will not be traceable.");\r
-                }\r
-                return con;\r
-            } else {\r
-                //validation failed, make sure we disconnect\r
-                //and clean up\r
-                error =true;\r
-            } //end if\r
-        } catch (Exception e) {\r
-            error = true;\r
-            log.error("Unable to create a new JDBC connection.", e);\r
-        } finally {\r
-            if (error ) {\r
-                release(con);\r
-            }\r
-            con.unlock();\r
-        }//catch\r
-        return null;\r
-    }\r
-\r
-    protected PooledConnection borrowConnection(long now, PooledConnection con) throws SQLException {\r
-        //we have a connection, lets set it up\r
-        boolean setToNull = false;\r
-        try {\r
-            con.lock();\r
-            if ((!con.isDiscarded()) && con.validate(PooledConnection.VALIDATE_BORROW)) {\r
-                //set the timestamp\r
-                con.setTimestamp(now);\r
-                if (getPoolProperties().isLogAbandoned()) {\r
-                    //set the stack trace for this pool\r
-                    con.setStackTrace(getThreadDump());\r
-                }\r
-                if (!busy.offer(con)) {\r
-                    log.debug("Connection doesn't fit into busy array, connection will not be traceable.");\r
-                }\r
-                return con;\r
-            }\r
-            //if we reached here, that means the connection\r
-            //is either discarded or validation failed.\r
-            //we will make one more attempt\r
-            //in order to guarantee that the thread that just acquired\r
-            //the connection shouldn't have to poll again.\r
-            try {\r
-                con.reconnect();\r
-                if (con.validate(PooledConnection.VALIDATE_INIT)) {\r
-                    //set the timestamp\r
-                    con.setTimestamp(now);\r
-                    if (getPoolProperties().isLogAbandoned()) {\r
-                        //set the stack trace for this pool\r
-                        con.setStackTrace(getThreadDump());\r
-                    }\r
-                    if (!busy.offer(con)) {\r
-                        log.debug("Connection doesn't fit into busy array, connection will not be traceable.");\r
-                    }\r
-                    return con;\r
-                } else {\r
-                    //validation failed.\r
-                    release(con);\r
-                    setToNull = true;\r
-                    throw new SQLException("Failed to validate a newly established connection.");\r
-                }\r
-            } catch (Exception x) {\r
-                release(con);\r
-                setToNull = true;\r
-                if (x instanceof SQLException) {\r
-                    throw (SQLException)x;\r
-                } else {\r
-                    throw new SQLException(getStackTrace(x));\r
-                }\r
-            }\r
-        } finally {\r
-            con.unlock();\r
-            if (setToNull) {\r
-                con = null;\r
-            }\r
-        }\r
-    }\r
-\r
-    /**\r
-     * Returns a connection to the pool\r
-     * @param con PooledConnection\r
-     */\r
-    protected void returnConnection(PooledConnection con) {\r
-        if (isClosed()) {\r
-            //if the connection pool is closed\r
-            //close the connection instead of returning it\r
-            release(con);\r
-            return;\r
-        } //end if\r
-\r
-        if (con != null) {\r
-            try {\r
-                con.lock();\r
-\r
-                if (busy.remove(con)) {\r
-                    if ((!con.isDiscarded()) && (!isClosed()) &&\r
-                            con.validate(PooledConnection.VALIDATE_RETURN)) {\r
-                        con.setStackTrace(null);\r
-                        con.setTimestamp(System.currentTimeMillis());\r
-                        if (!idle.offer(con)) {\r
-                            if (log.isDebugEnabled()) {\r
-                                log.debug("Connection ["+con+"] will be closed and not returned to the pool, idle.offer failed.");\r
-                            }\r
-                            release(con);\r
-                        }\r
-                    } else {\r
-                        if (log.isDebugEnabled()) {\r
-                            log.debug("Connection ["+con+"] will be closed and not returned to the pool.");\r
-                        }\r
-                        release(con);\r
-                    } //end if\r
-                } else {\r
-                    if (log.isDebugEnabled()) {\r
-                        log.debug("Connection ["+con+"] will be closed and not returned to the pool, busy.remove failed.");\r
-                    }\r
-                    release(con);\r
-                }\r
-            } finally {\r
-                con.unlock();\r
-            }\r
-        } //end if\r
-    } //checkIn\r
-\r
-    public void checkAbandoned() {\r
-        try {\r
-            if (busy.size()==0) return;\r
-            Iterator<PooledConnection> locked = busy.iterator();\r
-            while (locked.hasNext()) {\r
-                PooledConnection con = locked.next();\r
-                boolean setToNull = false;\r
-                try {\r
-                    con.lock();\r
-                    //the con has been returned to the pool\r
-                    //ignore it\r
-                    if (idle.contains(con))\r
-                        continue;\r
-                    long time = con.getTimestamp();\r
-                    long now = System.currentTimeMillis();\r
-                    if ((now - time) > con.getAbandonTimeout()) {\r
-                        busy.remove(con);\r
-                        abandon(con);\r
-                        release(con);\r
-                        setToNull = true;\r
-                    } else {\r
-                        //do nothing\r
-                    } //end if\r
-                } finally {\r
-                    con.unlock();\r
-                    if (setToNull)\r
-                        con = null;\r
-                }\r
-            } //while\r
-        } catch (ConcurrentModificationException e) {\r
-            log.debug("checkAbandoned failed." ,e);\r
-        } catch (Exception e) {\r
-            log.warn("checkAbandoned failed, it will be retried.",e);\r
-        }\r
-    }\r
-\r
-    public void checkIdle() {\r
-        try {\r
-            if (idle.size()==0) return;\r
-            long now = System.currentTimeMillis();\r
-            Iterator<PooledConnection> unlocked = idle.iterator();\r
-            while ( (idle.size()>=getPoolProperties().getMinIdle()) && unlocked.hasNext()) {\r
-                PooledConnection con = unlocked.next();\r
-                boolean setToNull = false;\r
-                try {\r
-                    con.lock();\r
-                    //the con been taken out, we can't clean it up\r
-                    if (busy.contains(con))\r
-                        continue;\r
-                    long time = con.getTimestamp();\r
-                    if (((now - time) > con.getReleaseTime()) && (getSize()>getPoolProperties().getMinIdle())) {\r
-                        release(con);\r
-                        idle.remove(con);\r
-                        setToNull = true;\r
-                    } else {\r
-                        //do nothing\r
-                    } //end if\r
-                } finally {\r
-                    con.unlock();\r
-                    if (setToNull)\r
-                        con = null;\r
-                }\r
-            } //while\r
-        } catch (ConcurrentModificationException e) {\r
-            log.debug("checkIdle failed." ,e);\r
-        } catch (Exception e) {\r
-            log.warn("checkIdle failed, it will be retried.",e);\r
-        }\r
-\r
-    }\r
-\r
-    public void testAllIdle() {\r
-        try {\r
-            if (idle.size()==0) return;\r
-            Iterator<PooledConnection> unlocked = idle.iterator();\r
-            while (unlocked.hasNext()) {\r
-                PooledConnection con = unlocked.next();\r
-                try {\r
-                    con.lock();\r
-                    //the con been taken out, we can't clean it up\r
-                    if (busy.contains(con))\r
-                        continue;\r
-                    if (!con.validate(PooledConnection.VALIDATE_IDLE)) {\r
-                        idle.remove(con);\r
-                        con.release();\r
-                    }\r
-                } finally {\r
-                    con.unlock();\r
-                }\r
-            } //while\r
-        } catch (ConcurrentModificationException e) {\r
-            log.debug("testAllIdle failed." ,e);\r
-        } catch (Exception e) {\r
-            log.warn("testAllIdle failed, it will be retried.",e);\r
-        }\r
-\r
-    }\r
-\r
-\r
-    protected static String getThreadDump() {\r
-        Exception x = new Exception();\r
-        x.fillInStackTrace();\r
-        return getStackTrace(x);\r
-    }\r
-\r
-    protected static String getStackTrace(Exception x) {\r
-        if (x == null) {\r
-            return null;\r
-        } else {\r
-            java.io.ByteArrayOutputStream bout = new java.io.ByteArrayOutputStream();\r
-            java.io.PrintStream writer = new java.io.PrintStream(bout);\r
-            x.printStackTrace(writer);\r
-            String result = bout.toString();\r
-            return result;\r
-        } //end if\r
-    }\r
-\r
-\r
-    protected PooledConnection create() throws java.lang.Exception {\r
-        PooledConnection con = new PooledConnection(getPoolProperties(), this);\r
-        return con;\r
-    }\r
-\r
-    protected void finalize(PooledConnection con) {\r
-        size.addAndGet(-1);\r
-    }\r
-\r
-    public void startJmx() {\r
-        try {\r
-            MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();\r
-            ObjectName name = new ObjectName("org.apache.tomcat.jdbc.pool.jmx:type=ConnectionPool,name="+getName());\r
-            mbs.registerMBean(new org.apache.tomcat.jdbc.pool.jmx.ConnectionPool(this), name);\r
-        } catch (Exception x) {\r
-            log.warn("Unable to start JMX integration for connection pool. Instance["+getName()+"] can't be monitored.",x);\r
-        }\r
-    }\r
-\r
-    public void stopJmx() {\r
-        try {\r
-            MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();\r
-            ObjectName name = new ObjectName("org.apache.tomcat.jdbc.pool.jmx:type=ConnectionPool,name="+getName());\r
-            mbs.unregisterMBean(name);\r
-        }catch (Exception x) {\r
-            log.warn("Unable to stop JMX integration for connection pool. Instance["+getName()+"].",x);\r
-        }\r
-    }\r
-\r
-\r
-    protected class PoolCleaner extends Thread {\r
-        protected ConnectionPool pool;\r
-        protected long sleepTime;\r
-        protected boolean run = true;\r
-        PoolCleaner(String name, ConnectionPool pool, long sleepTime) {\r
-            super(name);\r
-            this.setDaemon(true);\r
-            this.pool = pool;\r
-            this.sleepTime = sleepTime;\r
-            if (sleepTime <= 0) {\r
-                pool.log.warn("Database connection pool evicter thread interval is set to 0, defaulting to 30 seconds");\r
-                this.sleepTime = 1000 * 30;\r
-            } else if (sleepTime < 1000) {\r
-                pool.log.warn("Database connection pool evicter thread interval is set to lower than 1 second.");\r
-            }\r
-        }\r
-\r
-        public void run() {\r
-            while (run) {\r
-                try {\r
-                    sleep(sleepTime);\r
-                } catch (InterruptedException e) {\r
-                    // ignore it\r
-                    Thread.currentThread().interrupted();\r
-                    continue;\r
-                } //catch\r
-\r
-                if (pool.isClosed()) {\r
-                    if (pool.getSize() <= 0) {\r
-                        run = false;\r
-                    }\r
-                } else {\r
-                    try {\r
-                        if (pool.getPoolProperties().isRemoveAbandoned())\r
-                            pool.checkAbandoned();\r
-                        if (pool.getPoolProperties().getMaxIdle()<pool.idle.size())\r
-                            pool.checkIdle();\r
-                        if (pool.getPoolProperties().isTestWhileIdle())\r
-                            pool.testAllIdle();\r
-                    } catch (Exception x) {\r
-                        pool.log.error("", x);\r
-                    } //catch\r
-                } //end if\r
-            } //while\r
-        } //run\r
-\r
-        public void stopRunning() {\r
-            run = false;\r
-            interrupt();\r
-        }\r
-    }\r
-}\r
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.pool;
+
+import java.lang.management.ManagementFactory;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.Queue;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
+import org.apache.tomcat.jdbc.pool.jmx.ConnectionPoolMBean;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.management.InstanceAlreadyExistsException;
+import javax.management.MBeanRegistrationException;
+import javax.management.MBeanServer;
+import javax.management.MalformedObjectNameException;
+import javax.management.NotCompliantMBeanException;
+import javax.management.ObjectName;
+
+/**
+ * @author Filip Hanik
+ * @version 1.0
+ */
+
+public class ConnectionPool {
+
+    //logger
+    protected static Log log = LogFactory.getLog(ConnectionPool.class);
+
+    //===============================================================================
+    //         INSTANCE/QUICK ACCESS VARIABLE
+    //===============================================================================
+
+    /**
+     * All the information about the connection pool
+     */
+    protected PoolProperties poolProperties;
+
+    /**
+     * Contains all the connections that are in use
+     * TODO - this shouldn't be a blocking queue, simply a list to hold our objects
+     */
+    protected BlockingQueue<PooledConnection> busy;
+
+    /**
+     * Contains all the idle connections
+     */
+    protected BlockingQueue<PooledConnection> idle;
+
+    /**
+     * The thread that is responsible for checking abandoned and idle threads
+     */
+    protected PoolCleaner poolCleaner;
+
+    /**
+     * Pool closed flag
+     */
+    protected boolean closed = false;
+
+    /**
+     * Size of the pool
+     */
+    protected AtomicInteger size = new AtomicInteger(0);
+
+    /**
+     * Since newProxyInstance performs the same operation, over and over
+     * again, it is much more optimized if we simply store the constructor ourselves.
+     */
+    protected Constructor proxyClassConstructor;
+
+
+    //===============================================================================
+    //         PUBLIC METHODS
+    //===============================================================================
+
+    /**
+     * Instantiate a connection pool. This will create connections if initialSize is larger than 0
+     * @param prop PoolProperties - all the properties for this connection pool
+     * @throws SQLException
+     */
+    public ConnectionPool(PoolProperties prop) throws SQLException {
+        //setup quick access variables and pools
+        init(prop);
+    }
+
+    /**
+     * Borrows a connection from the pool
+     * @return Connection - a java.sql.Connection reflection proxy, wrapping the underlying object.
+     * @throws SQLException
+     */
+    public Connection getConnection() throws SQLException {
+        //check out a connection
+        PooledConnection con = (PooledConnection)borrowConnection();
+        JdbcInterceptor handler = con.getHandler();
+        if (handler==null) {
+            //build the proxy handler
+            handler = new ProxyConnection(this,con);
+            //set up the interceptor chain
+            String[] proxies = getPoolProperties().getJdbcInterceptorsAsArray();
+            for (int i=proxies.length-1; i>=0; i--) {
+                try {
+                    JdbcInterceptor interceptor =
+                        (JdbcInterceptor) Class.forName(proxies[i], true,
+                                Thread.currentThread().getContextClassLoader()).newInstance();
+                    interceptor.setNext(handler);
+                    handler = interceptor;
+                }catch(Exception x) {
+                    SQLException sx = new SQLException("Unable to instantiate interceptor chain.");
+                    sx.initCause(x);
+                    throw sx;
+                }
+            }
+            //cache handler for the next iteration
+            con.setHandler(handler);
+        } else {
+            JdbcInterceptor next = handler;
+            //we have a cached handler, reset it
+            while (next!=null) {
+                next.reset(this, con);
+                next = next.getNext();
+            }
+        }
+
+        try {
+            //cache the constructor
+            if (proxyClassConstructor == null ) {
+                Class proxyClass = Proxy.getProxyClass(ConnectionPool.class.getClassLoader(), new Class[] {java.sql.Connection.class});
+                proxyClassConstructor = proxyClass.getConstructor(new Class[] { InvocationHandler.class });
+            }
+            //create the proxy
+            //TODO possible optimization, keep track if this connection was returned properly, and don't generate a new facade
+            Connection connection = (Connection)proxyClassConstructor.newInstance(new Object[] { handler });
+            //return the connection
+            return connection;
+        }catch (Exception x) {
+            throw new SQLException();
+        }
+    }
+
+    /**
+     * Returns the name of this pool
+     * @return String
+     */
+    public String getName() {
+        return getPoolProperties().getPoolName();
+    }
+
+    /**
+     * Returns the pool properties associated with this connection pool
+     * @return PoolProperties
+     */
+    public PoolProperties getPoolProperties() {
+        return this.poolProperties;
+    }
+
+    /**
+     * Returns the total size of this pool, this includes both busy and idle connections
+     * @return int
+     */
+    public int getSize() {
+        return idle.size()+busy.size();
+    }
+
+    /**
+     * Returns the number of connections that are in use
+     * @return int
+     */
+    public int getActive() {
+        return busy.size();
+    }
+
+    public int getIdle() {
+        return idle.size();
+    }
+
+    /**
+     * Returns true if {@link #close close} has been called, and the connection pool is unusable
+     * @return boolean
+     */
+    public  boolean isClosed() {
+        return this.closed;
+    }
+
+    @Override
+    protected void finalize() throws Throwable {
+        close(true);
+    }
+
+    /**
+     * Closes the pool and all disconnects all idle connections
+     * Active connections will be closed upon the {@link java.sql.Connection#close close} method is called
+     * on the underlying connection instead of being returned to the pool
+     * @param force - true to even close the active connections
+     */
+    protected void close(boolean force) {
+        //are we already closed
+        if (this.closed) return;
+        //prevent other threads from entering
+        this.closed = true;
+        //stop background thread
+        if (poolCleaner!=null) {
+            poolCleaner.stopRunning();
+        }
+
+        /* release all idle connections */
+        BlockingQueue<PooledConnection> pool = (idle.size()>0)?idle:(force?busy:idle);
+        while (pool.size()>0) {
+            try {
+                //retrieve the next connection
+                PooledConnection con = pool.poll(1000, TimeUnit.MILLISECONDS);
+                //close it and retrieve the next one, if one is available
+                while (con != null) {
+                    //close the connection
+                    if (pool==idle)
+                        release(con);
+                    else
+                        abandon(con);
+                    con = pool.poll(1000, TimeUnit.MILLISECONDS);
+                } //while
+            } catch (InterruptedException ex) {
+                Thread.currentThread().interrupted();
+            }
+            if (pool.size()==0 && force && pool!=busy) pool = busy;
+        }
+        size.set(0);
+        if (this.getPoolProperties().isJmxEnabled()) stopJmx();
+    } //closePool
+
+
+    //===============================================================================
+    //         PROTECTED METHODS
+    //===============================================================================
+    /**
+     * Initialize the connection pool - called from the constructor
+     * @param properties PoolProperties - properties used to initialize the pool with
+     * @throws SQLException
+     */
+    protected void init (PoolProperties properties) throws SQLException {
+        poolProperties = properties;
+        //make space for 10 extra in case we flow over a bit
+        busy = new ArrayBlockingQueue<PooledConnection>(properties.getMaxActive(),false);
+        //busy = new FairBlockingQueue<PooledConnection>();
+        //make space for 10 extra in case we flow over a bit
+        if (properties.isFairQueue()) {
+            idle = new FairBlockingQueue<PooledConnection>();
+        } else {
+            idle = new ArrayBlockingQueue<PooledConnection>(properties.getMaxActive(),properties.isFairQueue());
+        }
+
+        //if the evictor thread is supposed to run, start it now
+        if (properties.isPoolSweeperEnabled()) {
+            poolCleaner = new PoolCleaner("[Pool-Cleaner]:" + properties.getName(), this, properties.getTimeBetweenEvictionRunsMillis());
+            poolCleaner.start();
+        } //end if
+
+        if (properties.getMaxActive()<properties.getInitialSize()) {
+            log.warn("initialSize is larger than maxActive, setting initialSize to: "+properties.getMaxActive());
+            properties.setInitialSize(properties.getMaxActive());
+        }
+        if (properties.getMinIdle()>properties.getMaxActive()) {
+            log.warn("minIdle is larger than maxActive, setting minIdle to: "+properties.getMaxActive());
+            properties.setMinIdle(properties.getMaxActive());
+        }
+        if (properties.getMaxIdle()>properties.getMaxActive()) {
+            log.warn("maxIdle is larger than maxActive, setting maxIdle to: "+properties.getMaxActive());
+            properties.setMaxIdle(properties.getMaxActive());
+        }
+        if (properties.getMaxIdle()<properties.getMinIdle()) {
+            log.warn("maxIdle is smaller than minIdle, setting maxIdle to: "+properties.getMinIdle());
+            properties.setMaxIdle(properties.getMinIdle());
+        }
+
+
+        //initialize the pool with its initial set of members
+        PooledConnection[] initialPool = new PooledConnection[poolProperties.getInitialSize()];
+        try {
+            for (int i = 0; i < initialPool.length; i++) {
+                initialPool[i] = this.borrowConnection();
+            } //for
+
+        } catch (SQLException x) {
+            close(true);
+            throw x;
+        } finally {
+            //return the members as idle to the pool
+            for (int i = 0; i < initialPool.length; i++) {
+                if (initialPool[i] != null) {
+                    try {this.returnConnection(initialPool[i]);}catch(Exception x){}
+                } //end if
+            } //for
+        } //catch
+        if (this.getPoolProperties().isJmxEnabled()) startJmx();
+        closed = false;
+    }
+
+
+//===============================================================================
+//         CONNECTION POOLING IMPL
+//===============================================================================
+
+    /**
+     * thread safe way to abandon a connection
+     * signals a connection to be abandoned.
+     * this will disconnect the connection, and log the stack trace if logAbanded=true
+     * @param con PooledConnection
+     */
+    protected void abandon(PooledConnection con) {
+        if (con == null)
+            return;
+        try {
+            con.lock();
+            if (getPoolProperties().isLogAbandoned()) {
+                log.warn("Connection has been abandoned " + con + ":" +con.getStackTrace());
+            }
+            con.abandon();
+        } finally {
+            con.unlock();
+        }
+    }
+
+    /**
+     * thread safe way to release a connection
+     * @param con PooledConnection
+     */
+    protected void release(PooledConnection con) {
+        if (con == null)
+            return;
+        try {
+            con.lock();
+            con.release();
+        } finally {
+            con.unlock();
+        }
+    }
+
+    /**
+     * Thread safe way to retrieve a connection from the pool
+     * @return PooledConnection
+     * @throws SQLException
+     */
+    protected PooledConnection borrowConnection() throws SQLException {
+
+        if (isClosed()) {
+            throw new SQLException("Connection pool closed.");
+        } //end if
+
+        //get the current time stamp
+        long now = System.currentTimeMillis();
+        //see if there is one available immediately
+        PooledConnection con = idle.poll();
+
+        while (true) {
+            if (con!=null) {
+                PooledConnection result = borrowConnection(now, con);
+                //validation might have failed, in which case null is returned
+                if (result!=null) return result;
+            }
+            if (size.get() < getPoolProperties().getMaxActive()) {
+                if (size.addAndGet(1) <= getPoolProperties().getMaxActive()) {
+                    return createConnection(now, con);
+                } else {
+                    size.addAndGet(-1); //restore the value, we didn't create a connection
+                }
+            } //end if
+
+            //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));
+            try {
+                //retrieve an existing connection
+                con = idle.poll(timetowait, TimeUnit.MILLISECONDS);
+            } catch (InterruptedException ex) {
+                Thread.currentThread().interrupted();
+            }
+            //we didn't get a connection, lets see if we timed out
+            if (con == null) {
+                if ((System.currentTimeMillis() - now) >= maxWait) {
+                    throw new SQLException(
+                        "Pool empty. Unable to fetch a connection in " + (maxWait / 1000) +
+                        " seconds, none available["+busy.size()+" in use].");
+                } else {
+                    //no timeout, lets try again
+                    continue;
+                }
+            }
+        } //while
+    }
+
+    protected PooledConnection createConnection(long now, PooledConnection con) {
+        //no connections where available we'll create one
+        boolean error = false;
+        try {
+            //connect and validate the connection
+            con = create();
+            con.lock();
+            con.connect();
+            if (con.validate(PooledConnection.VALIDATE_INIT)) {
+                //no need to lock a new one, its not contented
+                con.setTimestamp(now);
+                if (getPoolProperties().isLogAbandoned()) {
+                    con.setStackTrace(getThreadDump());
+                }
+                if (!busy.offer(con)) {
+                    log.debug("Connection doesn't fit into busy array, connection will not be traceable.");
+                }
+                return con;
+            } else {
+                //validation failed, make sure we disconnect
+                //and clean up
+                error =true;
+            } //end if
+        } catch (Exception e) {
+            error = true;
+            log.error("Unable to create a new JDBC connection.", e);
+        } finally {
+            if (error ) {
+                release(con);
+            }
+            con.unlock();
+        }//catch
+        return null;
+    }
+
+    protected PooledConnection borrowConnection(long now, PooledConnection con) throws SQLException {
+        //we have a connection, lets set it up
+        boolean setToNull = false;
+        try {
+            con.lock();
+            if ((!con.isDiscarded()) && con.validate(PooledConnection.VALIDATE_BORROW)) {
+                //set the timestamp
+                con.setTimestamp(now);
+                if (getPoolProperties().isLogAbandoned()) {
+                    //set the stack trace for this pool
+                    con.setStackTrace(getThreadDump());
+                }
+                if (!busy.offer(con)) {
+                    log.debug("Connection doesn't fit into busy array, connection will not be traceable.");
+                }
+                return con;
+            }
+            //if we reached here, that means the connection
+            //is either discarded or validation failed.
+            //we will make one more attempt
+            //in order to guarantee that the thread that just acquired
+            //the connection shouldn't have to poll again.
+            try {
+                con.reconnect();
+                if (con.validate(PooledConnection.VALIDATE_INIT)) {
+                    //set the timestamp
+                    con.setTimestamp(now);
+                    if (getPoolProperties().isLogAbandoned()) {
+                        //set the stack trace for this pool
+                        con.setStackTrace(getThreadDump());
+                    }
+                    if (!busy.offer(con)) {
+                        log.debug("Connection doesn't fit into busy array, connection will not be traceable.");
+                    }
+                    return con;
+                } else {
+                    //validation failed.
+                    release(con);
+                    setToNull = true;
+                    throw new SQLException("Failed to validate a newly established connection.");
+                }
+            } catch (Exception x) {
+                release(con);
+                setToNull = true;
+                if (x instanceof SQLException) {
+                    throw (SQLException)x;
+                } else {
+                    throw new SQLException(getStackTrace(x));
+                }
+            }
+        } finally {
+            con.unlock();
+            if (setToNull) {
+                con = null;
+            }
+        }
+    }
+
+    /**
+     * Returns a connection to the pool
+     * @param con PooledConnection
+     */
+    protected void returnConnection(PooledConnection con) {
+        if (isClosed()) {
+            //if the connection pool is closed
+            //close the connection instead of returning it
+            release(con);
+            return;
+        } //end if
+
+        if (con != null) {
+            try {
+                con.lock();
+
+                if (busy.remove(con)) {
+                    if ((!con.isDiscarded()) && (!isClosed()) &&
+                            con.validate(PooledConnection.VALIDATE_RETURN)) {
+                        con.setStackTrace(null);
+                        con.setTimestamp(System.currentTimeMillis());
+                        if (!idle.offer(con)) {
+                            if (log.isDebugEnabled()) {
+                                log.debug("Connection ["+con+"] will be closed and not returned to the pool, idle.offer failed.");
+                            }
+                            release(con);
+                        }
+                    } else {
+                        if (log.isDebugEnabled()) {
+                            log.debug("Connection ["+con+"] will be closed and not returned to the pool.");
+                        }
+                        release(con);
+                    } //end if
+                } else {
+                    if (log.isDebugEnabled()) {
+                        log.debug("Connection ["+con+"] will be closed and not returned to the pool, busy.remove failed.");
+                    }
+                    release(con);
+                }
+            } finally {
+                con.unlock();
+            }
+        } //end if
+    } //checkIn
+
+    public void checkAbandoned() {
+        try {
+            if (busy.size()==0) return;
+            Iterator<PooledConnection> locked = busy.iterator();
+            while (locked.hasNext()) {
+                PooledConnection con = locked.next();
+                boolean setToNull = false;
+                try {
+                    con.lock();
+                    //the con has been returned to the pool
+                    //ignore it
+                    if (idle.contains(con))
+                        continue;
+                    long time = con.getTimestamp();
+                    long now = System.currentTimeMillis();
+                    if ((now - time) > con.getAbandonTimeout()) {
+                        busy.remove(con);
+                        abandon(con);
+                        release(con);
+                        setToNull = true;
+                    } else {
+                        //do nothing
+                    } //end if
+                } finally {
+                    con.unlock();
+                    if (setToNull)
+                        con = null;
+                }
+            } //while
+        } catch (ConcurrentModificationException e) {
+            log.debug("checkAbandoned failed." ,e);
+        } catch (Exception e) {
+            log.warn("checkAbandoned failed, it will be retried.",e);
+        }
+    }
+
+    public void checkIdle() {
+        try {
+            if (idle.size()==0) return;
+            long now = System.currentTimeMillis();
+            Iterator<PooledConnection> unlocked = idle.iterator();
+            while ( (idle.size()>=getPoolProperties().getMinIdle()) && unlocked.hasNext()) {
+                PooledConnection con = unlocked.next();
+                boolean setToNull = false;
+                try {
+                    con.lock();
+                    //the con been taken out, we can't clean it up
+                    if (busy.contains(con))
+                        continue;
+                    long time = con.getTimestamp();
+                    if (((now - time) > con.getReleaseTime()) && (getSize()>getPoolProperties().getMinIdle())) {
+                        release(con);
+                        idle.remove(con);
+                        setToNull = true;
+                    } else {
+                        //do nothing
+                    } //end if
+                } finally {
+                    con.unlock();
+                    if (setToNull)
+                        con = null;
+                }
+            } //while
+        } catch (ConcurrentModificationException e) {
+            log.debug("checkIdle failed." ,e);
+        } catch (Exception e) {
+            log.warn("checkIdle failed, it will be retried.",e);
+        }
+
+    }
+
+    public void testAllIdle() {
+        try {
+            if (idle.size()==0) return;
+            Iterator<PooledConnection> unlocked = idle.iterator();
+            while (unlocked.hasNext()) {
+                PooledConnection con = unlocked.next();
+                try {
+                    con.lock();
+                    //the con been taken out, we can't clean it up
+                    if (busy.contains(con))
+                        continue;
+                    if (!con.validate(PooledConnection.VALIDATE_IDLE)) {
+                        idle.remove(con);
+                        con.release();
+                    }
+                } finally {
+                    con.unlock();
+                }
+            } //while
+        } catch (ConcurrentModificationException e) {
+            log.debug("testAllIdle failed." ,e);
+        } catch (Exception e) {
+            log.warn("testAllIdle failed, it will be retried.",e);
+        }
+
+    }
+
+
+    protected static String getThreadDump() {
+        Exception x = new Exception();
+        x.fillInStackTrace();
+        return getStackTrace(x);
+    }
+
+    protected static String getStackTrace(Exception x) {
+        if (x == null) {
+            return null;
+        } else {
+            java.io.ByteArrayOutputStream bout = new java.io.ByteArrayOutputStream();
+            java.io.PrintStream writer = new java.io.PrintStream(bout);
+            x.printStackTrace(writer);
+            String result = bout.toString();
+            return result;
+        } //end if
+    }
+
+
+    protected PooledConnection create() throws java.lang.Exception {
+        PooledConnection con = new PooledConnection(getPoolProperties(), this);
+        return con;
+    }
+
+    protected void finalize(PooledConnection con) {
+        size.addAndGet(-1);
+    }
+
+    public void startJmx() {
+        try {
+            MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+            ObjectName name = new ObjectName("org.apache.tomcat.jdbc.pool.jmx:type=ConnectionPool,name="+getName());
+            mbs.registerMBean(new org.apache.tomcat.jdbc.pool.jmx.ConnectionPool(this), name);
+        } catch (Exception x) {
+            log.warn("Unable to start JMX integration for connection pool. Instance["+getName()+"] can't be monitored.",x);
+        }
+    }
+
+    public void stopJmx() {
+        try {
+            MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
+            ObjectName name = new ObjectName("org.apache.tomcat.jdbc.pool.jmx:type=ConnectionPool,name="+getName());
+            mbs.unregisterMBean(name);
+        }catch (Exception x) {
+            log.warn("Unable to stop JMX integration for connection pool. Instance["+getName()+"].",x);
+        }
+    }
+
+
+    protected class PoolCleaner extends Thread {
+        protected ConnectionPool pool;
+        protected long sleepTime;
+        protected boolean run = true;
+        PoolCleaner(String name, ConnectionPool pool, long sleepTime) {
+            super(name);
+            this.setDaemon(true);
+            this.pool = pool;
+            this.sleepTime = sleepTime;
+            if (sleepTime <= 0) {
+                pool.log.warn("Database connection pool evicter thread interval is set to 0, defaulting to 30 seconds");
+                this.sleepTime = 1000 * 30;
+            } else if (sleepTime < 1000) {
+                pool.log.warn("Database connection pool evicter thread interval is set to lower than 1 second.");
+            }
+        }
+
+        public void run() {
+            while (run) {
+                try {
+                    sleep(sleepTime);
+                } catch (InterruptedException e) {
+                    // ignore it
+                    Thread.currentThread().interrupted();
+                    continue;
+                } //catch
+
+                if (pool.isClosed()) {
+                    if (pool.getSize() <= 0) {
+                        run = false;
+                    }
+                } else {
+                    try {
+                        if (pool.getPoolProperties().isRemoveAbandoned())
+                            pool.checkAbandoned();
+                        if (pool.getPoolProperties().getMaxIdle()<pool.idle.size())
+                            pool.checkIdle();
+                        if (pool.getPoolProperties().isTestWhileIdle())
+                            pool.testAllIdle();
+                    } catch (Exception x) {
+                        pool.log.error("", x);
+                    } //catch
+                } //end if
+            } //while
+        } //run
+
+        public void stopRunning() {
+            run = false;
+            interrupt();
+        }
+    }
+}
index 7241117..a1761e0 100644 (file)
@@ -1,28 +1,28 @@
-/*\r
- * Licensed to the Apache Software Foundation (ASF) under one or more\r
- * contributor license agreements.  See the NOTICE file distributed with\r
- * this work for additional information regarding copyright ownership.\r
- * The ASF licenses this file to You under the Apache License, Version 2.0\r
- * (the "License"); you may not use this file except in compliance with\r
- * the License.  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.apache.tomcat.jdbc.pool;\r
-\r
-\r
-/**\r
- * A DataSource that can be instantiated through IoC and implements the DataSource interface\r
- * since the DataSourceProxy is used as a generic proxy\r
- * @author Filip Hanik\r
- * @version 1.0\r
- */\r
-public class DataSource extends DataSourceProxy implements javax.sql.DataSource {\r
-\r
-}\r
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.pool;
+
+
+/**
+ * A DataSource that can be instantiated through IoC and implements the DataSource interface
+ * since the DataSourceProxy is used as a generic proxy
+ * @author Filip Hanik
+ * @version 1.0
+ */
+public class DataSource extends DataSourceProxy implements javax.sql.DataSource {
+
+}
index 9cc4e4a..0d2753e 100644 (file)
-/*\r
- * Licensed to the Apache Software Foundation (ASF) under one or more\r
- * contributor license agreements.  See the NOTICE file distributed with\r
- * this work for additional information regarding copyright ownership.\r
- * The ASF licenses this file to You under the Apache License, Version 2.0\r
- * (the "License"); you may not use this file except in compliance with\r
- * the License.  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.apache.tomcat.jdbc.pool;\r
-\r
-\r
-import java.io.ByteArrayInputStream;\r
-import java.lang.reflect.InvocationHandler;\r
-import java.lang.reflect.Method;\r
-import java.lang.reflect.Proxy;\r
-import java.sql.Connection;\r
-import java.util.HashMap;\r
-import java.util.Hashtable;\r
-import java.util.Properties;\r
-\r
-import javax.naming.Context;\r
-import javax.naming.Name;\r
-import javax.naming.RefAddr;\r
-import javax.naming.Reference;\r
-import javax.naming.spi.ObjectFactory;\r
-import javax.sql.DataSource;\r
-\r
-import org.apache.juli.logging.Log;\r
-import org.apache.juli.logging.LogFactory;\r
-\r
-/**\r
- * <p>JNDI object factory that creates an instance of\r
- * <code>BasicDataSource</code> that has been configured based on the\r
- * <code>RefAddr</code> values of the specified <code>Reference</code>,\r
- * which must match the names and data types of the\r
- * <code>BasicDataSource</code> bean properties.</p>\r
- * <br/>\r
- * Properties available for configuration:<br/>\r
- * <a href="http://commons.apache.org/dbcp/configuration.html">Commons DBCP properties</a><br/>\r
- *<ol>\r
- *  <li>initSQL - A query that gets executed once, right after the connection is established.</li>\r
- *  <li>testOnConnect - run validationQuery after connection has been established.</li>\r
- *  <li>validationInterval - avoid excess validation, only run validation at most at this frequency - time in milliseconds.</li>\r
- *  <li>jdbcInterceptors - a semicolon separated list of classnames extending {@link JdbcInterceptor} class.</li>\r
- *  <li>jmxEnabled - true of false, whether to register the pool with JMX.</li>\r
- *  <li>fairQueue - true of false, whether the pool should sacrifice a little bit of performance for true fairness.</li>\r
- *</ol>\r
- * @author Craig R. McClanahan\r
- * @author Dirk Verbeeck\r
- * @author Filip Hanik\r
- */\r
-public class DataSourceFactory implements ObjectFactory {\r
-    protected static Log log = LogFactory.getLog(DataSourceFactory.class);\r
-\r
-    protected final static String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit";\r
-    protected final static String PROP_DEFAULTREADONLY = "defaultReadOnly";\r
-    protected final static String PROP_DEFAULTTRANSACTIONISOLATION = "defaultTransactionIsolation";\r
-    protected final static String PROP_DEFAULTCATALOG = "defaultCatalog";\r
-    \r
-    protected final static String PROP_DRIVERCLASSNAME = "driverClassName";\r
-    protected final static String PROP_PASSWORD = "password";\r
-    protected final static String PROP_URL = "url";\r
-    protected final static String PROP_USERNAME = "username";\r
-\r
-    protected final static String PROP_MAXACTIVE = "maxActive";\r
-    protected final static String PROP_MAXIDLE = "maxIdle";\r
-    protected final static String PROP_MINIDLE = "minIdle";\r
-    protected final static String PROP_INITIALSIZE = "initialSize";\r
-    protected final static String PROP_MAXWAIT = "maxWait";\r
-    \r
-    protected final static String PROP_TESTONBORROW = "testOnBorrow";\r
-    protected final static String PROP_TESTONRETURN = "testOnReturn";\r
-    protected final static String PROP_TESTWHILEIDLE = "testWhileIdle";\r
-    protected final static String PROP_TESTONCONNECT = "testOnConnect";\r
-    protected final static String PROP_VALIDATIONQUERY = "validationQuery";\r
-    \r
-    protected final static String PROP_TIMEBETWEENEVICTIONRUNSMILLIS = "timeBetweenEvictionRunsMillis";\r
-    protected final static String PROP_NUMTESTSPEREVICTIONRUN = "numTestsPerEvictionRun";\r
-    protected final static String PROP_MINEVICTABLEIDLETIMEMILLIS = "minEvictableIdleTimeMillis";\r
-    \r
-    protected final static String PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED = "accessToUnderlyingConnectionAllowed";\r
-    \r
-    protected final static String PROP_REMOVEABANDONED = "removeAbandoned";\r
-    protected final static String PROP_REMOVEABANDONEDTIMEOUT = "removeAbandonedTimeout";\r
-    protected final static String PROP_LOGABANDONED = "logAbandoned";\r
-    \r
-    protected final static String PROP_POOLPREPAREDSTATEMENTS = "poolPreparedStatements";\r
-    protected final static String PROP_MAXOPENPREPAREDSTATEMENTS = "maxOpenPreparedStatements";\r
-    protected final static String PROP_CONNECTIONPROPERTIES = "connectionProperties";\r
-    \r
-    protected final static String PROP_INITSQL = "initSQL";\r
-    protected final static String PROP_INTERCEPTORS = "jdbcInterceptors";\r
-    protected final static String PROP_VALIDATIONINTERVAL = "validationInterval";\r
-    protected final static String PROP_JMX_ENABLED = "jmxEnabled";\r
-    protected final static String PROP_FAIR_QUEUE = "fairQueue";\r
-    \r
-    public static final int UNKNOWN_TRANSACTIONISOLATION = -1;\r
-\r
-\r
-    protected final static String[] ALL_PROPERTIES = {\r
-        PROP_DEFAULTAUTOCOMMIT,\r
-        PROP_DEFAULTREADONLY,\r
-        PROP_DEFAULTTRANSACTIONISOLATION,\r
-        PROP_DEFAULTCATALOG,\r
-        PROP_DRIVERCLASSNAME,\r
-        PROP_MAXACTIVE,\r
-        PROP_MAXIDLE,\r
-        PROP_MINIDLE,\r
-        PROP_INITIALSIZE,\r
-        PROP_MAXWAIT,\r
-        PROP_TESTONBORROW,\r
-        PROP_TESTONRETURN,\r
-        PROP_TIMEBETWEENEVICTIONRUNSMILLIS,\r
-        PROP_NUMTESTSPEREVICTIONRUN,\r
-        PROP_MINEVICTABLEIDLETIMEMILLIS,\r
-        PROP_TESTWHILEIDLE,\r
-        PROP_TESTONCONNECT,\r
-        PROP_PASSWORD,\r
-        PROP_URL,\r
-        PROP_USERNAME,\r
-        PROP_VALIDATIONQUERY,\r
-        PROP_VALIDATIONINTERVAL,\r
-        PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED,\r
-        PROP_REMOVEABANDONED,\r
-        PROP_REMOVEABANDONEDTIMEOUT,\r
-        PROP_LOGABANDONED,\r
-        PROP_POOLPREPAREDSTATEMENTS,\r
-        PROP_MAXOPENPREPAREDSTATEMENTS,\r
-        PROP_CONNECTIONPROPERTIES,\r
-        PROP_INITSQL,\r
-        PROP_INTERCEPTORS,\r
-        PROP_JMX_ENABLED,\r
-        PROP_FAIR_QUEUE\r
-    };\r
-\r
-    // -------------------------------------------------- ObjectFactory Methods\r
-\r
-    /**\r
-     * <p>Create and return a new <code>BasicDataSource</code> instance.  If no\r
-     * instance can be created, return <code>null</code> instead.</p>\r
-     *\r
-     * @param obj The possibly null object containing location or\r
-     *  reference information that can be used in creating an object\r
-     * @param name The name of this object relative to <code>nameCtx</code>\r
-     * @param nameCtx The context relative to which the <code>name</code>\r
-     *  parameter is specified, or <code>null</code> if <code>name</code>\r
-     *  is relative to the default initial context\r
-     * @param environment The possibly null environment that is used in\r
-     *  creating this object\r
-     *\r
-     * @exception Exception if an exception occurs creating the instance\r
-     */\r
-    public Object getObjectInstance(Object obj, Name name, Context nameCtx,\r
-                                    Hashtable environment) throws Exception {\r
-\r
-        // We only know how to deal with <code>javax.naming.Reference</code>s\r
-        // that specify a class name of "javax.sql.DataSource"\r
-        if ((obj == null) || !(obj instanceof Reference)) {\r
-            return null;\r
-        }\r
-        Reference ref = (Reference) obj;\r
-        if (!"javax.sql.DataSource".equals(ref.getClassName())) {\r
-            return null;\r
-        }\r
-\r
-        Properties properties = new Properties();\r
-        for (int i = 0; i < ALL_PROPERTIES.length; i++) {\r
-            String propertyName = ALL_PROPERTIES[i];\r
-            RefAddr ra = ref.get(propertyName);\r
-            if (ra != null) {\r
-                String propertyValue = ra.getContent().toString();\r
-                properties.setProperty(propertyName, propertyValue);\r
-            }\r
-        }\r
-\r
-        return createDataSource(properties);\r
-    }\r
-\r
-    /**\r
-     * Creates and configures a {@link BasicDataSource} instance based on the\r
-     * given properties.\r
-     *\r
-     * @param properties the datasource configuration properties\r
-     * @throws Exception if an error occurs creating the data source\r
-     */\r
-    public static DataSource createDataSource(Properties properties) throws Exception {\r
-        org.apache.tomcat.jdbc.pool.DataSourceProxy dataSource = new org.apache.tomcat.jdbc.pool.DataSourceProxy();\r
-\r
-        String value = null;\r
-\r
-        value = properties.getProperty(PROP_DEFAULTAUTOCOMMIT);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setDefaultAutoCommit(Boolean.valueOf(value));\r
-        }\r
-\r
-        value = properties.getProperty(PROP_DEFAULTREADONLY);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setDefaultReadOnly(Boolean.valueOf(value));\r
-        }\r
-\r
-        value = properties.getProperty(PROP_DEFAULTTRANSACTIONISOLATION);\r
-        if (value != null) {\r
-            int level = UNKNOWN_TRANSACTIONISOLATION;\r
-            if ("NONE".equalsIgnoreCase(value)) {\r
-                level = Connection.TRANSACTION_NONE;\r
-            } else if ("READ_COMMITTED".equalsIgnoreCase(value)) {\r
-                level = Connection.TRANSACTION_READ_COMMITTED;\r
-            } else if ("READ_UNCOMMITTED".equalsIgnoreCase(value)) {\r
-                level = Connection.TRANSACTION_READ_UNCOMMITTED;\r
-            } else if ("REPEATABLE_READ".equalsIgnoreCase(value)) {\r
-                level = Connection.TRANSACTION_REPEATABLE_READ;\r
-            } else if ("SERIALIZABLE".equalsIgnoreCase(value)) {\r
-                level = Connection.TRANSACTION_SERIALIZABLE;\r
-            } else {\r
-                try {\r
-                    level = Integer.parseInt(value);\r
-                } catch (NumberFormatException e) {\r
-                    System.err.println("Could not parse defaultTransactionIsolation: " + value);\r
-                    System.err.println("WARNING: defaultTransactionIsolation not set");\r
-                    System.err.println("using default value of database driver");\r
-                    level = UNKNOWN_TRANSACTIONISOLATION;\r
-                }\r
-            }\r
-            dataSource.getPoolProperties().setDefaultTransactionIsolation(level);\r
-        }\r
-\r
-        value = properties.getProperty(PROP_DEFAULTCATALOG);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setDefaultCatalog(value);\r
-        }\r
-\r
-        value = properties.getProperty(PROP_DRIVERCLASSNAME);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setDriverClassName(value);\r
-        }\r
-\r
-        value = properties.getProperty(PROP_MAXACTIVE);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setMaxActive(Integer.parseInt(value));\r
-        }\r
-\r
-        value = properties.getProperty(PROP_MAXIDLE);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setMaxIdle(Integer.parseInt(value));\r
-        }\r
-\r
-        value = properties.getProperty(PROP_MINIDLE);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setMinIdle(Integer.parseInt(value));\r
-        }\r
-\r
-        value = properties.getProperty(PROP_INITIALSIZE);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setInitialSize(Integer.parseInt(value));\r
-        }\r
-\r
-        value = properties.getProperty(PROP_MAXWAIT);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setMaxWait(Integer.parseInt(value));\r
-        }\r
-\r
-        value = properties.getProperty(PROP_TESTONBORROW);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setTestOnBorrow(Boolean.valueOf(value).booleanValue());\r
-        }\r
-\r
-        value = properties.getProperty(PROP_TESTONRETURN);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setTestOnReturn(Boolean.valueOf(value).booleanValue());\r
-        }\r
-\r
-        value = properties.getProperty(PROP_TESTONCONNECT);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setTestOnConnect(Boolean.valueOf(value).booleanValue());\r
-        }\r
-\r
-        value = properties.getProperty(PROP_TIMEBETWEENEVICTIONRUNSMILLIS);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setTimeBetweenEvictionRunsMillis(Integer.parseInt(value));\r
-        }\r
-\r
-        value = properties.getProperty(PROP_NUMTESTSPEREVICTIONRUN);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setNumTestsPerEvictionRun(Integer.parseInt(value));\r
-        }\r
-\r
-        value = properties.getProperty(PROP_MINEVICTABLEIDLETIMEMILLIS);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setMinEvictableIdleTimeMillis(Integer.parseInt(value));\r
-        }\r
-\r
-        value = properties.getProperty(PROP_TESTWHILEIDLE);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setTestWhileIdle(Boolean.valueOf(value).booleanValue());\r
-        }\r
-\r
-        value = properties.getProperty(PROP_PASSWORD);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setPassword(value);\r
-        }\r
-\r
-        value = properties.getProperty(PROP_URL);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setUrl(value);\r
-        }\r
-\r
-        value = properties.getProperty(PROP_USERNAME);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setUsername(value);\r
-        }\r
-\r
-        value = properties.getProperty(PROP_VALIDATIONQUERY);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setValidationQuery(value);\r
-        }\r
-\r
-        value = properties.getProperty(PROP_VALIDATIONINTERVAL);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setValidationInterval(Long.parseLong(value));\r
-        }\r
-\r
-        value = properties.getProperty(PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().\r
-                setAccessToUnderlyingConnectionAllowed(Boolean.valueOf(value).booleanValue());\r
-        }\r
-\r
-        value = properties.getProperty(PROP_REMOVEABANDONED);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setRemoveAbandoned(Boolean.valueOf(value).booleanValue());\r
-        }\r
-\r
-        value = properties.getProperty(PROP_REMOVEABANDONEDTIMEOUT);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setRemoveAbandonedTimeout(Integer.parseInt(value));\r
-        }\r
-\r
-        value = properties.getProperty(PROP_LOGABANDONED);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setLogAbandoned(Boolean.valueOf(value).booleanValue());\r
-        }\r
-\r
-        value = properties.getProperty(PROP_POOLPREPAREDSTATEMENTS);\r
-        if (value != null) {\r
-            log.warn(PROP_POOLPREPAREDSTATEMENTS + " is not a valid setting, it will have no effect.");\r
-        }\r
-\r
-        value = properties.getProperty(PROP_MAXOPENPREPAREDSTATEMENTS);\r
-        if (value != null) {\r
-            log.warn(PROP_MAXOPENPREPAREDSTATEMENTS + " is not a valid setting, it will have no effect.");\r
-        }\r
-\r
-        value = properties.getProperty(PROP_CONNECTIONPROPERTIES);\r
-        if (value != null) {\r
-            Properties p = getProperties(value);\r
-            dataSource.getPoolProperties().setDbProperties(p);\r
-        } else {\r
-            dataSource.getPoolProperties().setDbProperties(new Properties());\r
-        }\r
-\r
-        dataSource.getPoolProperties().getDbProperties().setProperty("user",dataSource.getPoolProperties().getUsername());\r
-        dataSource.getPoolProperties().getDbProperties().setProperty("password",dataSource.getPoolProperties().getPassword());\r
-\r
-        value = properties.getProperty(PROP_INITSQL);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setInitSQL(value);\r
-        }\r
-\r
-        value = properties.getProperty(PROP_INTERCEPTORS);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setJdbcInterceptors(value);\r
-        }\r
-\r
-        value = properties.getProperty(PROP_JMX_ENABLED);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setJmxEnabled(Boolean.parseBoolean(value));\r
-        }\r
-        \r
-        value = properties.getProperty(PROP_FAIR_QUEUE);\r
-        if (value != null) {\r
-            dataSource.getPoolProperties().setFairQueue(Boolean.parseBoolean(value));\r
-        }\r
-        \r
-\r
-        // Return the configured DataSource instance\r
-        DataSource ds = getDataSource(dataSource);\r
-        return ds;\r
-    }\r
-\r
-    public static DataSource getDataSource(org.apache.tomcat.jdbc.pool.DataSourceProxy dataSource) {\r
-        DataSourceHandler handler = new DataSourceHandler(dataSource);\r
-        DataSource ds = (DataSource)Proxy.newProxyInstance(DataSourceFactory.class.getClassLoader(), new Class[] {javax.sql.DataSource.class}, handler);\r
-        return ds;\r
-    }\r
-\r
-    /**\r
-     * <p>Parse properties from the string. Format of the string must be [propertyName=property;]*<p>\r
-     * @param propText\r
-     * @return Properties\r
-     * @throws Exception\r
-     */\r
-    static protected Properties getProperties(String propText) throws Exception {\r
-        Properties p = new Properties();\r
-        if (propText != null) {\r
-            p.load(new ByteArrayInputStream(propText.replace(';', '\n').\r
-                                            getBytes()));\r
-        }\r
-        return p;\r
-    }\r
-\r
-    protected static class DataSourceHandler implements InvocationHandler {\r
-        protected org.apache.tomcat.jdbc.pool.DataSourceProxy datasource = null;\r
-        protected static HashMap<Method,Method> methods = new HashMap<Method,Method>();\r
-        public DataSourceHandler(org.apache.tomcat.jdbc.pool.DataSourceProxy ds) {\r
-            this.datasource = ds;\r
-        }\r
-\r
-        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {\r
-            Method m = methods.get(method);\r
-            if (m==null) {\r
-                m = datasource.getClass().getMethod(method.getName(), method.getParameterTypes());\r
-                methods.put(method, m);\r
-            }\r
-            return m.invoke(datasource, args);\r
-        }\r
-\r
-    }\r
-}\r
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.pool;
+
+
+import java.io.ByteArrayInputStream;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.sql.Connection;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Properties;
+
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.RefAddr;
+import javax.naming.Reference;
+import javax.naming.spi.ObjectFactory;
+import javax.sql.DataSource;
+
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
+/**
+ * <p>JNDI object factory that creates an instance of
+ * <code>BasicDataSource</code> that has been configured based on the
+ * <code>RefAddr</code> values of the specified <code>Reference</code>,
+ * which must match the names and data types of the
+ * <code>BasicDataSource</code> bean properties.</p>
+ * <br/>
+ * Properties available for configuration:<br/>
+ * <a href="http://commons.apache.org/dbcp/configuration.html">Commons DBCP properties</a><br/>
+ *<ol>
+ *  <li>initSQL - A query that gets executed once, right after the connection is established.</li>
+ *  <li>testOnConnect - run validationQuery after connection has been established.</li>
+ *  <li>validationInterval - avoid excess validation, only run validation at most at this frequency - time in milliseconds.</li>
+ *  <li>jdbcInterceptors - a semicolon separated list of classnames extending {@link JdbcInterceptor} class.</li>
+ *  <li>jmxEnabled - true of false, whether to register the pool with JMX.</li>
+ *  <li>fairQueue - true of false, whether the pool should sacrifice a little bit of performance for true fairness.</li>
+ *</ol>
+ * @author Craig R. McClanahan
+ * @author Dirk Verbeeck
+ * @author Filip Hanik
+ */
+public class DataSourceFactory implements ObjectFactory {
+    protected static Log log = LogFactory.getLog(DataSourceFactory.class);
+
+    protected final static String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit";
+    protected final static String PROP_DEFAULTREADONLY = "defaultReadOnly";
+    protected final static String PROP_DEFAULTTRANSACTIONISOLATION = "defaultTransactionIsolation";
+    protected final static String PROP_DEFAULTCATALOG = "defaultCatalog";
+    
+    protected final static String PROP_DRIVERCLASSNAME = "driverClassName";
+    protected final static String PROP_PASSWORD = "password";
+    protected final static String PROP_URL = "url";
+    protected final static String PROP_USERNAME = "username";
+
+    protected final static String PROP_MAXACTIVE = "maxActive";
+    protected final static String PROP_MAXIDLE = "maxIdle";
+    protected final static String PROP_MINIDLE = "minIdle";
+    protected final static String PROP_INITIALSIZE = "initialSize";
+    protected final static String PROP_MAXWAIT = "maxWait";
+    
+    protected final static String PROP_TESTONBORROW = "testOnBorrow";
+    protected final static String PROP_TESTONRETURN = "testOnReturn";
+    protected final static String PROP_TESTWHILEIDLE = "testWhileIdle";
+    protected final static String PROP_TESTONCONNECT = "testOnConnect";
+    protected final static String PROP_VALIDATIONQUERY = "validationQuery";
+    
+    protected final static String PROP_TIMEBETWEENEVICTIONRUNSMILLIS = "timeBetweenEvictionRunsMillis";
+    protected final static String PROP_NUMTESTSPEREVICTIONRUN = "numTestsPerEvictionRun";
+    protected final static String PROP_MINEVICTABLEIDLETIMEMILLIS = "minEvictableIdleTimeMillis";
+    
+    protected final static String PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED = "accessToUnderlyingConnectionAllowed";
+    
+    protected final static String PROP_REMOVEABANDONED = "removeAbandoned";
+    protected final static String PROP_REMOVEABANDONEDTIMEOUT = "removeAbandonedTimeout";
+    protected final static String PROP_LOGABANDONED = "logAbandoned";
+    
+    protected final static String PROP_POOLPREPAREDSTATEMENTS = "poolPreparedStatements";
+    protected final static String PROP_MAXOPENPREPAREDSTATEMENTS = "maxOpenPreparedStatements";
+    protected final static String PROP_CONNECTIONPROPERTIES = "connectionProperties";
+    
+    protected final static String PROP_INITSQL = "initSQL";
+    protected final static String PROP_INTERCEPTORS = "jdbcInterceptors";
+    protected final static String PROP_VALIDATIONINTERVAL = "validationInterval";
+    protected final static String PROP_JMX_ENABLED = "jmxEnabled";
+    protected final static String PROP_FAIR_QUEUE = "fairQueue";
+    
+    public static final int UNKNOWN_TRANSACTIONISOLATION = -1;
+
+
+    protected final static String[] ALL_PROPERTIES = {
+        PROP_DEFAULTAUTOCOMMIT,
+        PROP_DEFAULTREADONLY,
+        PROP_DEFAULTTRANSACTIONISOLATION,
+        PROP_DEFAULTCATALOG,
+        PROP_DRIVERCLASSNAME,
+        PROP_MAXACTIVE,
+        PROP_MAXIDLE,
+        PROP_MINIDLE,
+        PROP_INITIALSIZE,
+        PROP_MAXWAIT,
+        PROP_TESTONBORROW,
+        PROP_TESTONRETURN,
+        PROP_TIMEBETWEENEVICTIONRUNSMILLIS,
+        PROP_NUMTESTSPEREVICTIONRUN,
+        PROP_MINEVICTABLEIDLETIMEMILLIS,
+        PROP_TESTWHILEIDLE,
+        PROP_TESTONCONNECT,
+        PROP_PASSWORD,
+        PROP_URL,
+        PROP_USERNAME,
+        PROP_VALIDATIONQUERY,
+        PROP_VALIDATIONINTERVAL,
+        PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED,
+        PROP_REMOVEABANDONED,
+        PROP_REMOVEABANDONEDTIMEOUT,
+        PROP_LOGABANDONED,
+        PROP_POOLPREPAREDSTATEMENTS,
+        PROP_MAXOPENPREPAREDSTATEMENTS,
+        PROP_CONNECTIONPROPERTIES,
+        PROP_INITSQL,
+        PROP_INTERCEPTORS,
+        PROP_JMX_ENABLED,
+        PROP_FAIR_QUEUE
+    };
+
+    // -------------------------------------------------- ObjectFactory Methods
+
+    /**
+     * <p>Create and return a new <code>BasicDataSource</code> instance.  If no
+     * instance can be created, return <code>null</code> instead.</p>
+     *
+     * @param obj The possibly null object containing location or
+     *  reference information that can be used in creating an object
+     * @param name The name of this object relative to <code>nameCtx</code>
+     * @param nameCtx The context relative to which the <code>name</code>
+     *  parameter is specified, or <code>null</code> if <code>name</code>
+     *  is relative to the default initial context
+     * @param environment The possibly null environment that is used in
+     *  creating this object
+     *
+     * @exception Exception if an exception occurs creating the instance
+     */
+    public Object getObjectInstance(Object obj, Name name, Context nameCtx,
+                                    Hashtable environment) throws Exception {
+
+        // We only know how to deal with <code>javax.naming.Reference</code>s
+        // that specify a class name of "javax.sql.DataSource"
+        if ((obj == null) || !(obj instanceof Reference)) {
+            return null;
+        }
+        Reference ref = (Reference) obj;
+        if (!"javax.sql.DataSource".equals(ref.getClassName())) {
+            return null;
+        }
+
+        Properties properties = new Properties();
+        for (int i = 0; i < ALL_PROPERTIES.length; i++) {
+            String propertyName = ALL_PROPERTIES[i];
+            RefAddr ra = ref.get(propertyName);
+            if (ra != null) {
+                String propertyValue = ra.getContent().toString();
+                properties.setProperty(propertyName, propertyValue);
+            }
+        }
+
+        return createDataSource(properties);
+    }
+
+    /**
+     * Creates and configures a {@link BasicDataSource} instance based on the
+     * given properties.
+     *
+     * @param properties the datasource configuration properties
+     * @throws Exception if an error occurs creating the data source
+     */
+    public static DataSource createDataSource(Properties properties) throws Exception {
+        org.apache.tomcat.jdbc.pool.DataSourceProxy dataSource = new org.apache.tomcat.jdbc.pool.DataSourceProxy();
+
+        String value = null;
+
+        value = properties.getProperty(PROP_DEFAULTAUTOCOMMIT);
+        if (value != null) {
+            dataSource.getPoolProperties().setDefaultAutoCommit(Boolean.valueOf(value));
+        }
+
+        value = properties.getProperty(PROP_DEFAULTREADONLY);
+        if (value != null) {
+            dataSource.getPoolProperties().setDefaultReadOnly(Boolean.valueOf(value));
+        }
+
+        value = properties.getProperty(PROP_DEFAULTTRANSACTIONISOLATION);
+        if (value != null) {
+            int level = UNKNOWN_TRANSACTIONISOLATION;
+            if ("NONE".equalsIgnoreCase(value)) {
+                level = Connection.TRANSACTION_NONE;
+            } else if ("READ_COMMITTED".equalsIgnoreCase(value)) {
+                level = Connection.TRANSACTION_READ_COMMITTED;
+            } else if ("READ_UNCOMMITTED".equalsIgnoreCase(value)) {
+                level = Connection.TRANSACTION_READ_UNCOMMITTED;
+            } else if ("REPEATABLE_READ".equalsIgnoreCase(value)) {
+                level = Connection.TRANSACTION_REPEATABLE_READ;
+            } else if ("SERIALIZABLE".equalsIgnoreCase(value)) {
+                level = Connection.TRANSACTION_SERIALIZABLE;
+            } else {
+                try {
+                    level = Integer.parseInt(value);
+                } catch (NumberFormatException e) {
+                    System.err.println("Could not parse defaultTransactionIsolation: " + value);
+                    System.err.println("WARNING: defaultTransactionIsolation not set");
+                    System.err.println("using default value of database driver");
+                    level = UNKNOWN_TRANSACTIONISOLATION;
+                }
+            }
+            dataSource.getPoolProperties().setDefaultTransactionIsolation(level);
+        }
+
+        value = properties.getProperty(PROP_DEFAULTCATALOG);
+        if (value != null) {
+            dataSource.getPoolProperties().setDefaultCatalog(value);
+        }
+
+        value = properties.getProperty(PROP_DRIVERCLASSNAME);
+        if (value != null) {
+            dataSource.getPoolProperties().setDriverClassName(value);
+        }
+
+        value = properties.getProperty(PROP_MAXACTIVE);
+        if (value != null) {
+            dataSource.getPoolProperties().setMaxActive(Integer.parseInt(value));
+        }
+
+        value = properties.getProperty(PROP_MAXIDLE);
+        if (value != null) {
+            dataSource.getPoolProperties().setMaxIdle(Integer.parseInt(value));
+        }
+
+        value = properties.getProperty(PROP_MINIDLE);
+        if (value != null) {
+            dataSource.getPoolProperties().setMinIdle(Integer.parseInt(value));
+        }
+
+        value = properties.getProperty(PROP_INITIALSIZE);
+        if (value != null) {
+            dataSource.getPoolProperties().setInitialSize(Integer.parseInt(value));
+        }
+
+        value = properties.getProperty(PROP_MAXWAIT);
+        if (value != null) {
+            dataSource.getPoolProperties().setMaxWait(Integer.parseInt(value));
+        }
+
+        value = properties.getProperty(PROP_TESTONBORROW);
+        if (value != null) {
+            dataSource.getPoolProperties().setTestOnBorrow(Boolean.valueOf(value).booleanValue());
+        }
+
+        value = properties.getProperty(PROP_TESTONRETURN);
+        if (value != null) {
+            dataSource.getPoolProperties().setTestOnReturn(Boolean.valueOf(value).booleanValue());
+        }
+
+        value = properties.getProperty(PROP_TESTONCONNECT);
+        if (value != null) {
+            dataSource.getPoolProperties().setTestOnConnect(Boolean.valueOf(value).booleanValue());
+        }
+
+        value = properties.getProperty(PROP_TIMEBETWEENEVICTIONRUNSMILLIS);
+        if (value != null) {
+            dataSource.getPoolProperties().setTimeBetweenEvictionRunsMillis(Integer.parseInt(value));
+        }
+
+        value = properties.getProperty(PROP_NUMTESTSPEREVICTIONRUN);
+        if (value != null) {
+            dataSource.getPoolProperties().setNumTestsPerEvictionRun(Integer.parseInt(value));
+        }
+
+        value = properties.getProperty(PROP_MINEVICTABLEIDLETIMEMILLIS);
+        if (value != null) {
+            dataSource.getPoolProperties().setMinEvictableIdleTimeMillis(Integer.parseInt(value));
+        }
+
+        value = properties.getProperty(PROP_TESTWHILEIDLE);
+        if (value != null) {
+            dataSource.getPoolProperties().setTestWhileIdle(Boolean.valueOf(value).booleanValue());
+        }
+
+        value = properties.getProperty(PROP_PASSWORD);
+        if (value != null) {
+            dataSource.getPoolProperties().setPassword(value);
+        }
+
+        value = properties.getProperty(PROP_URL);
+        if (value != null) {
+            dataSource.getPoolProperties().setUrl(value);
+        }
+
+        value = properties.getProperty(PROP_USERNAME);
+        if (value != null) {
+            dataSource.getPoolProperties().setUsername(value);
+        }
+
+        value = properties.getProperty(PROP_VALIDATIONQUERY);
+        if (value != null) {
+            dataSource.getPoolProperties().setValidationQuery(value);
+        }
+
+        value = properties.getProperty(PROP_VALIDATIONINTERVAL);
+        if (value != null) {
+            dataSource.getPoolProperties().setValidationInterval(Long.parseLong(value));
+        }
+
+        value = properties.getProperty(PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED);
+        if (value != null) {
+            dataSource.getPoolProperties().
+                setAccessToUnderlyingConnectionAllowed(Boolean.valueOf(value).booleanValue());
+        }
+
+        value = properties.getProperty(PROP_REMOVEABANDONED);
+        if (value != null) {
+            dataSource.getPoolProperties().setRemoveAbandoned(Boolean.valueOf(value).booleanValue());
+        }
+
+        value = properties.getProperty(PROP_REMOVEABANDONEDTIMEOUT);
+        if (value != null) {
+            dataSource.getPoolProperties().setRemoveAbandonedTimeout(Integer.parseInt(value));
+        }
+
+        value = properties.getProperty(PROP_LOGABANDONED);
+        if (value != null) {
+            dataSource.getPoolProperties().setLogAbandoned(Boolean.valueOf(value).booleanValue());
+        }
+
+        value = properties.getProperty(PROP_POOLPREPAREDSTATEMENTS);
+        if (value != null) {
+            log.warn(PROP_POOLPREPAREDSTATEMENTS + " is not a valid setting, it will have no effect.");
+        }
+
+        value = properties.getProperty(PROP_MAXOPENPREPAREDSTATEMENTS);
+        if (value != null) {
+            log.warn(PROP_MAXOPENPREPAREDSTATEMENTS + " is not a valid setting, it will have no effect.");
+        }
+
+        value = properties.getProperty(PROP_CONNECTIONPROPERTIES);
+        if (value != null) {
+            Properties p = getProperties(value);
+            dataSource.getPoolProperties().setDbProperties(p);
+        } else {
+            dataSource.getPoolProperties().setDbProperties(new Properties());
+        }
+
+        dataSource.getPoolProperties().getDbProperties().setProperty("user",dataSource.getPoolProperties().getUsername());
+        dataSource.getPoolProperties().getDbProperties().setProperty("password",dataSource.getPoolProperties().getPassword());
+
+        value = properties.getProperty(PROP_INITSQL);
+        if (value != null) {
+            dataSource.getPoolProperties().setInitSQL(value);
+        }
+
+        value = properties.getProperty(PROP_INTERCEPTORS);
+        if (value != null) {
+            dataSource.getPoolProperties().setJdbcInterceptors(value);
+        }
+
+        value = properties.getProperty(PROP_JMX_ENABLED);
+        if (value != null) {
+            dataSource.getPoolProperties().setJmxEnabled(Boolean.parseBoolean(value));
+        }
+        
+        value = properties.getProperty(PROP_FAIR_QUEUE);
+        if (value != null) {
+            dataSource.getPoolProperties().setFairQueue(Boolean.parseBoolean(value));
+        }
+        
+
+        // Return the configured DataSource instance
+        DataSource ds = getDataSource(dataSource);
+        return ds;
+    }
+
+    public static DataSource getDataSource(org.apache.tomcat.jdbc.pool.DataSourceProxy dataSource) {
+        DataSourceHandler handler = new DataSourceHandler(dataSource);
+        DataSource ds = (DataSource)Proxy.newProxyInstance(DataSourceFactory.class.getClassLoader(), new Class[] {javax.sql.DataSource.class}, handler);
+        return ds;
+    }
+
+    /**
+     * <p>Parse properties from the string. Format of the string must be [propertyName=property;]*<p>
+     * @param propText
+     * @return Properties
+     * @throws Exception
+     */
+    static protected Properties getProperties(String propText) throws Exception {
+        Properties p = new Properties();
+        if (propText != null) {
+            p.load(new ByteArrayInputStream(propText.replace(';', '\n').
+                                            getBytes()));
+        }
+        return p;
+    }
+
+    protected static class DataSourceHandler implements InvocationHandler {
+        protected org.apache.tomcat.jdbc.pool.DataSourceProxy datasource = null;
+        protected static HashMap<Method,Method> methods = new HashMap<Method,Method>();
+        public DataSourceHandler(org.apache.tomcat.jdbc.pool.DataSourceProxy ds) {
+            this.datasource = ds;
+        }
+
+        public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+            Method m = methods.get(method);
+            if (m==null) {
+                m = datasource.getClass().getMethod(method.getName(), method.getParameterTypes());
+                methods.put(method, m);
+            }
+            return m.invoke(datasource, args);
+        }
+
+    }
+}
index ba07230..4301686 100644 (file)
-/*\r
- * Licensed to the Apache Software Foundation (ASF) under one or more\r
- * contributor license agreements.  See the NOTICE file distributed with\r
- * this work for additional information regarding copyright ownership.\r
- * The ASF licenses this file to You under the Apache License, Version 2.0\r
- * (the "License"); you may not use this file except in compliance with\r
- * the License.  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.apache.tomcat.jdbc.pool;\r
-\r
-import java.io.PrintWriter;\r
-import java.sql.Connection;\r
-import java.sql.SQLException;\r
-import java.util.Iterator;\r
-\r
-import org.apache.juli.logging.Log;\r
-import org.apache.juli.logging.LogFactory;\r
-\r
-/**\r
- *\r
- * <p>Title: Uber Pool</p>\r
- *\r
- * <p>Description: A simple, yet efficient and powerful connection pool</p>\r
- *\r
- * <p>Copyright: Copyright (c) 2008 Filip Hanik</p>\r
- *\r
- * <p> </p>\r
- *\r
- * @author Filip Hanik\r
- * @version 1.0\r
- */\r
-\r
-public class DataSourceProxy  {\r
-    protected static Log log = LogFactory.getLog(DataSourceProxy.class);\r
-    \r
-    protected Driver driver;\r
-    protected PoolProperties poolProperties = new PoolProperties();\r
-\r
-    public DataSourceProxy() {\r
-    }\r
-\r
-\r
-    public boolean isWrapperFor(Class<?> iface) throws SQLException {\r
-        // we are not a wrapper of anything\r
-        return false;\r
-    }\r
-\r
-\r
-    public <T> T unwrap(Class<T> iface) throws SQLException {\r
-        //we can't unwrap anything\r
-        return null;\r
-    }\r
-\r
-    /**\r
-     * {@inheritDoc}\r
-     */\r
-    public Connection getConnection(String username, String password) throws SQLException {\r
-        return getConnection();\r
-    }\r
-\r
-    public PoolProperties getPoolProperties() {\r
-        return poolProperties;\r
-    }\r
-\r
-    /**\r
-     * Sets up the connection pool, by creating a pooling driver.\r
-     * @return Driver\r
-     * @throws SQLException\r
-     */\r
-    public synchronized Driver createDriver() throws SQLException {\r
-        if (driver != null) {\r
-            return driver;\r
-        } else {\r
-            driver = new org.apache.tomcat.jdbc.pool.Driver(getPoolProperties());\r
-            return driver;\r
-        }\r
-    }\r
-\r
-    /**\r
-     * {@inheritDoc}\r
-     */\r
-\r
-    public Connection getConnection() throws SQLException {\r
-        if (driver == null)\r
-            driver = createDriver();\r
-        return driver.connect(poolProperties.getPoolName(), null);\r
-    }\r
-\r
-    /**\r
-     * {@inheritDoc}\r
-     */\r
-    public PooledConnection getPooledConnection() throws SQLException {\r
-        return (PooledConnection) getConnection();\r
-    }\r
-\r
-    /**\r
-     * {@inheritDoc}\r
-     */\r
-    public PooledConnection getPooledConnection(String username,\r
-                                                String password) throws SQLException {\r
-        return (PooledConnection) getConnection();\r
-    }\r
-\r
-    /**\r
-     * {@inheritDoc}\r
-     */\r
-    public PrintWriter getLogWriter() throws SQLException {\r
-        return null;\r
-    }\r
-\r
-    /**\r
-     * {@inheritDoc}\r
-     */\r
-    public void setLogWriter(PrintWriter out) throws SQLException {\r
-    }\r
-\r
-    /**\r
-     * {@inheritDoc}\r
-     */\r
-    public int getLoginTimeout() {\r
-        if (poolProperties == null) {\r
-            return 0;\r
-        } else {\r
-            return poolProperties.getMaxWait() / 1000;\r
-        }\r
-    }\r
-\r
-    /**\r
-     * {@inheritDoc}\r
-     */\r
-    public void setLoginTimeout(int i) {\r
-        if (poolProperties == null) {\r
-            return;\r
-        } else {\r
-            poolProperties.setMaxWait(1000 * i);\r
-        }\r
-\r
-    }\r
-\r
-\r
-    public void close() {\r
-        close(false);\r
-    }\r
-    public void close(boolean all) {\r
-        try {\r
-            if (driver != null) {\r
-                Driver d = driver;\r
-                driver = null;\r
-                d.closePool(poolProperties.getPoolName(), all);\r
-            }\r
-        }catch (Exception x) {\r
-            x.printStackTrace();\r
-        }\r
-    }\r
-\r
-    protected void finalize() throws Throwable {\r
-        //terminate the pool?\r
-        close(true);\r
-    }\r
-\r
-    public int getPoolSize() throws SQLException{\r
-        if (driver == null)\r
-            driver = createDriver();\r
-        return driver.getPool(getPoolProperties().getPoolName()).getSize();\r
-    }\r
-\r
-   public String toString() {\r
-        return super.toString()+"{"+getPoolProperties()+"}";\r
-    }\r
-\r
-/*-----------------------------------------------------------------------*/\r
-//      PROPERTIES WHEN NOT USED WITH FACTORY\r
-/*------------------------------------------------------------------------*/\r
-    public void setPoolProperties(PoolProperties poolProperties) {\r
-        this.poolProperties = poolProperties;\r
-    }\r
-\r
-    public void setDriverClassName(String driverClassName) {\r
-        this.poolProperties.setDriverClassName(driverClassName);\r
-    }\r
-\r
-    public void setInitialSize(int initialSize) {\r
-        this.poolProperties.setInitialSize(initialSize);\r
-    }\r
-\r
-    public void setInitSQL(String initSQL) {\r
-        this.poolProperties.setInitSQL(initSQL);\r
-    }\r
-\r
-    public void setLogAbandoned(boolean logAbandoned) {\r
-        this.poolProperties.setLogAbandoned(logAbandoned);\r
-    }\r
-\r
-    public void setMaxActive(int maxActive) {\r
-        this.poolProperties.setMaxIdle(maxActive);\r
-    }\r
-\r
-    public void setMaxIdle(int maxIdle) {\r
-        this.poolProperties.setMaxIdle(maxIdle);\r
-    }\r
-\r
-    public void setMaxWait(int maxWait) {\r
-        this.poolProperties.setMaxWait(maxWait);\r
-    }\r
-\r
-    public void setMinEvictableIdleTimeMillis(int minEvictableIdleTimeMillis) {\r
-        this.poolProperties.setMinEvictableIdleTimeMillis(\r
-            minEvictableIdleTimeMillis);\r
-    }\r
-\r
-    public void setMinIdle(int minIdle) {\r
-        this.setMinIdle(minIdle);\r
-    }\r
-\r
-    public void setNumTestsPerEvictionRun(int numTestsPerEvictionRun) {\r
-        this.poolProperties.setNumTestsPerEvictionRun(numTestsPerEvictionRun);\r
-    }\r
-\r
-    public void setPassword(String password) {\r
-        this.poolProperties.setPassword(password);\r
-        this.poolProperties.getDbProperties().setProperty("password",this.poolProperties.getPassword());\r
-    }\r
-\r
-    public void setRemoveAbandoned(boolean removeAbandoned) {\r
-        this.poolProperties.setRemoveAbandoned(removeAbandoned);\r
-    }\r
-\r
-    public void setRemoveAbandonedTimeout(int removeAbandonedTimeout) {\r
-        this.poolProperties.setRemoveAbandonedTimeout(removeAbandonedTimeout);\r
-    }\r
-\r
-    public void setTestOnBorrow(boolean testOnBorrow) {\r
-        this.poolProperties.setTestOnBorrow(testOnBorrow);\r
-    }\r
-\r
-    public void setTestOnConnect(boolean testOnConnect) {\r
-        this.poolProperties.setTestOnConnect(testOnConnect);\r
-    }\r
-\r
-    public void setTestOnReturn(boolean testOnReturn) {\r
-        this.poolProperties.setTestOnReturn(testOnReturn);\r
-    }\r
-\r
-    public void setTestWhileIdle(boolean testWhileIdle) {\r
-        this.poolProperties.setTestWhileIdle(testWhileIdle);\r
-    }\r
-\r
-    public void setTimeBetweenEvictionRunsMillis(int\r
-                                                 timeBetweenEvictionRunsMillis) {\r
-        this.poolProperties.setTimeBetweenEvictionRunsMillis(\r
-            timeBetweenEvictionRunsMillis);\r
-    }\r
-\r
-    public void setUrl(String url) {\r
-        this.poolProperties.setUrl(url);\r
-    }\r
-\r
-    public void setUsername(String username) {\r
-        this.poolProperties.setUsername(username);\r
-        this.poolProperties.getDbProperties().setProperty("user",getPoolProperties().getUsername());\r
-    }\r
-\r
-    public void setValidationInterval(long validationInterval) {\r
-        this.poolProperties.setValidationInterval(validationInterval);\r
-    }\r
-\r
-    public void setValidationQuery(String validationQuery) {\r
-        this.poolProperties.setValidationQuery(validationQuery);\r
-    }\r
-\r
-    public void setJdbcInterceptors(String interceptors) {\r
-        this.getPoolProperties().setJdbcInterceptors(interceptors);\r
-    }\r
-\r
-    public void setJmxEnabled(boolean enabled) {\r
-        this.getPoolProperties().setJmxEnabled(enabled);\r
-    }\r
-    \r
-    public void setFairQueue(boolean fairQueue) {\r
-        this.getPoolProperties().setFairQueue(fairQueue);\r
-    }\r
-    \r
-    public void setConnectionProperties(String properties) {\r
-        try {\r
-            java.util.Properties prop = DataSourceFactory.getProperties(properties);\r
-            Iterator i = prop.keySet().iterator();\r
-            while (i.hasNext()) {\r
-                String key = (String)i.next();\r
-                String value = prop.getProperty(key);\r
-                getPoolProperties().getDbProperties().setProperty(key, value);\r
-            }\r
-            \r
-        }catch (Exception x) {\r
-            log.error("Unable to parse connection properties.", x);\r
-            throw new RuntimeException(x);\r
-        }\r
-    }\r
-\r
-\r
-}\r
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.pool;
+
+import java.io.PrintWriter;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Iterator;
+
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+
+/**
+ *
+ * <p>Title: Uber Pool</p>
+ *
+ * <p>Description: A simple, yet efficient and powerful connection pool</p>
+ *
+ * <p>Copyright: Copyright (c) 2008 Filip Hanik</p>
+ *
+ * <p> </p>
+ *
+ * @author Filip Hanik
+ * @version 1.0
+ */
+
+public class DataSourceProxy  {
+    protected static Log log = LogFactory.getLog(DataSourceProxy.class);
+    
+    protected Driver driver;
+    protected PoolProperties poolProperties = new PoolProperties();
+
+    public DataSourceProxy() {
+    }
+
+
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        // we are not a wrapper of anything
+        return false;
+    }
+
+
+    public <T> T unwrap(Class<T> iface) throws SQLException {
+        //we can't unwrap anything
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Connection getConnection(String username, String password) throws SQLException {
+        return getConnection();
+    }
+
+    public PoolProperties getPoolProperties() {
+        return poolProperties;
+    }
+
+    /**
+     * Sets up the connection pool, by creating a pooling driver.
+     * @return Driver
+     * @throws SQLException
+     */
+    public synchronized Driver createDriver() throws SQLException {
+        if (driver != null) {
+            return driver;
+        } else {
+            driver = new org.apache.tomcat.jdbc.pool.Driver(getPoolProperties());
+            return driver;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+
+    public Connection getConnection() throws SQLException {
+        if (driver == null)
+            driver = createDriver();
+        return driver.connect(poolProperties.getPoolName(), null);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public PooledConnection getPooledConnection() throws SQLException {
+        return (PooledConnection) getConnection();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public PooledConnection getPooledConnection(String username,
+                                                String password) throws SQLException {
+        return (PooledConnection) getConnection();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public PrintWriter getLogWriter() throws SQLException {
+        return null;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void setLogWriter(PrintWriter out) throws SQLException {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int getLoginTimeout() {
+        if (poolProperties == null) {
+            return 0;
+        } else {
+            return poolProperties.getMaxWait() / 1000;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public void setLoginTimeout(int i) {
+        if (poolProperties == null) {
+            return;
+        } else {
+            poolProperties.setMaxWait(1000 * i);
+        }
+
+    }
+
+
+    public void close() {
+        close(false);
+    }
+    public void close(boolean all) {
+        try {
+            if (driver != null) {
+                Driver d = driver;
+                driver = null;
+                d.closePool(poolProperties.getPoolName(), all);
+            }
+        }catch (Exception x) {
+            x.printStackTrace();
+        }
+    }
+
+    protected void finalize() throws Throwable {
+        //terminate the pool?
+        close(true);
+    }
+
+    public int getPoolSize() throws SQLException{
+        if (driver == null)
+            driver = createDriver();
+        return driver.getPool(getPoolProperties().getPoolName()).getSize();
+    }
+
+   public String toString() {
+        return super.toString()+"{"+getPoolProperties()+"}";
+    }
+
+/*-----------------------------------------------------------------------*/
+//      PROPERTIES WHEN NOT USED WITH FACTORY
+/*------------------------------------------------------------------------*/
+    public void setPoolProperties(PoolProperties poolProperties) {
+        this.poolProperties = poolProperties;
+    }
+
+    public void setDriverClassName(String driverClassName) {
+        this.poolProperties.setDriverClassName(driverClassName);
+    }
+
+    public void setInitialSize(int initialSize) {
+        this.poolProperties.setInitialSize(initialSize);
+    }
+
+    public void setInitSQL(String initSQL) {
+        this.poolProperties.setInitSQL(initSQL);
+    }
+
+    public void setLogAbandoned(boolean logAbandoned) {
+        this.poolProperties.setLogAbandoned(logAbandoned);
+    }
+
+    public void setMaxActive(int maxActive) {
+        this.poolProperties.setMaxIdle(maxActive);
+    }
+
+    public void setMaxIdle(int maxIdle) {
+        this.poolProperties.setMaxIdle(maxIdle);
+    }
+
+    public void setMaxWait(int maxWait) {
+        this.poolProperties.setMaxWait(maxWait);
+    }
+
+    public void setMinEvictableIdleTimeMillis(int minEvictableIdleTimeMillis) {
+        this.poolProperties.setMinEvictableIdleTimeMillis(
+            minEvictableIdleTimeMillis);
+    }
+
+    public void setMinIdle(int minIdle) {
+        this.setMinIdle(minIdle);
+    }
+
+    public void setNumTestsPerEvictionRun(int numTestsPerEvictionRun) {
+        this.poolProperties.setNumTestsPerEvictionRun(numTestsPerEvictionRun);
+    }
+
+    public void setPassword(String password) {
+        this.poolProperties.setPassword(password);
+        this.poolProperties.getDbProperties().setProperty("password",this.poolProperties.getPassword());
+    }
+
+    public void setRemoveAbandoned(boolean removeAbandoned) {
+        this.poolProperties.setRemoveAbandoned(removeAbandoned);
+    }
+
+    public void setRemoveAbandonedTimeout(int removeAbandonedTimeout) {
+        this.poolProperties.setRemoveAbandonedTimeout(removeAbandonedTimeout);
+    }
+
+    public void setTestOnBorrow(boolean testOnBorrow) {
+        this.poolProperties.setTestOnBorrow(testOnBorrow);
+    }
+
+    public void setTestOnConnect(boolean testOnConnect) {
+        this.poolProperties.setTestOnConnect(testOnConnect);
+    }
+
+    public void setTestOnReturn(boolean testOnReturn) {
+        this.poolProperties.setTestOnReturn(testOnReturn);
+    }
+
+    public void setTestWhileIdle(boolean testWhileIdle) {
+        this.poolProperties.setTestWhileIdle(testWhileIdle);
+    }
+
+    public void setTimeBetweenEvictionRunsMillis(int
+                                                 timeBetweenEvictionRunsMillis) {
+        this.poolProperties.setTimeBetweenEvictionRunsMillis(
+            timeBetweenEvictionRunsMillis);
+    }
+
+    public void setUrl(String url) {
+        this.poolProperties.setUrl(url);
+    }
+
+    public void setUsername(String username) {
+        this.poolProperties.setUsername(username);
+        this.poolProperties.getDbProperties().setProperty("user",getPoolProperties().getUsername());
+    }
+
+    public void setValidationInterval(long validationInterval) {
+        this.poolProperties.setValidationInterval(validationInterval);
+    }
+
+    public void setValidationQuery(String validationQuery) {
+        this.poolProperties.setValidationQuery(validationQuery);
+    }
+
+    public void setJdbcInterceptors(String interceptors) {
+        this.getPoolProperties().setJdbcInterceptors(interceptors);
+    }
+
+    public void setJmxEnabled(boolean enabled) {
+        this.getPoolProperties().setJmxEnabled(enabled);
+    }
+    
+    public void setFairQueue(boolean fairQueue) {
+        this.getPoolProperties().setFairQueue(fairQueue);
+    }
+    
+    public void setConnectionProperties(String properties) {
+        try {
+            java.util.Properties prop = DataSourceFactory.getProperties(properties);
+            Iterator i = prop.keySet().iterator();
+            while (i.hasNext()) {
+                String key = (String)i.next();
+                String value = prop.getProperty(key);
+                getPoolProperties().getDbProperties().setProperty(key, value);
+            }
+            
+        }catch (Exception x) {
+            log.error("Unable to parse connection properties.", x);
+            throw new RuntimeException(x);
+        }
+    }
+
+
+}
index 9e03825..85d3861 100644 (file)
-/*\r
- * Licensed to the Apache Software Foundation (ASF) under one or more\r
- * contributor license agreements.  See the NOTICE file distributed with\r
- * this work for additional information regarding copyright ownership.\r
- * The ASF licenses this file to You under the Apache License, Version 2.0\r
- * (the "License"); you may not use this file except in compliance with\r
- * the License.  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.apache.tomcat.jdbc.pool;\r
-\r
-\r
-import java.sql.Connection;\r
-import java.sql.DriverPropertyInfo;\r
-import java.sql.SQLException;\r
-import java.util.HashMap;\r
-import java.util.Properties;\r
-\r
-import org.apache.juli.logging.Log;\r
-import org.apache.juli.logging.LogFactory;\r
-/**\r
- * @author Filip Hanik\r
- * @version 1.0\r
- */\r
-public class Driver implements java.sql.Driver {\r
-\r
-    protected static Log log = LogFactory.getLog(Driver.class);\r
-\r
-    protected static HashMap pooltable = new HashMap(11);\r
-\r
-    public Driver() throws SQLException {\r
-    }\r
-\r
-    public Driver(PoolProperties properties) throws SQLException {\r
-        init(properties);\r
-    } //Driver\r
-\r
-    public void init(PoolProperties properties) throws SQLException {\r
-        if (pooltable.get(properties.getPoolName()) != null)\r
-            throw new SQLException("Pool identified by:" + properties.getPoolName() + " already exists.");\r
-        ConnectionPool pool = new ConnectionPool(properties);\r
-        pooltable.put(properties.getPoolName(), pool);\r
-    }\r
-\r
-    public void closePool(String url, boolean all) throws SQLException {\r
-        ConnectionPool pool = (ConnectionPool) pooltable.get(url);\r
-        if (pool == null) {\r
-            throw new SQLException("No connection pool established for URL:" + url);\r
-        } else {\r
-            pool.close(all);\r
-        }\r
-        pooltable.remove(url);\r
-    }\r
-\r
-    /**\r
-     * {@inheritDoc}\r
-     */\r
-    public Connection connect(String url, Properties info) throws SQLException {\r
-        ConnectionPool pool = (ConnectionPool) pooltable.get(url);\r
-        if (pool == null) {\r
-            throw new SQLException("No connection pool established for URL:" + url);\r
-        } else {\r
-            try {\r
-                return pool.getConnection();\r
-            } catch (SQLException forward) {\r
-                throw forward;\r
-            } catch (Exception e) {\r
-                throw new SQLException("Unknow pool exception:" + ConnectionPool.getStackTrace(e));\r
-            } //catch\r
-        } //end if\r
-    } //connect\r
-\r
-    /**\r
-     * {@inheritDoc}\r
-     */\r
-    public boolean acceptsURL(String url) throws SQLException {\r
-        /* check if the driver has a connection pool with that name */\r
-        return (pooltable.get(url) != null ? true : false);\r
-    } //acceptsUrl\r
-\r
-    /**\r
-     * {@inheritDoc}\r
-     */\r
-    public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws\r
-        SQLException {\r
-        return new DriverPropertyInfo[0];\r
-    } //getPropertyInfo\r
-\r
-    /**\r
-     * {@inheritDoc}\r
-     */\r
-    public int getMajorVersion() {\r
-        return 1;\r
-    }\r
-\r
-    /**\r
-     * {@inheritDoc}\r
-     */\r
-    public int getMinorVersion() {\r
-        return 0;\r
-    }\r
-\r
-    /**\r
-     * {@inheritDoc}\r
-     */\r
-    public boolean jdbcCompliant() {\r
-        return true;\r
-    }\r
-\r
-    public ConnectionPool getPool(String url) throws SQLException {\r
-        return (ConnectionPool) pooltable.get(url);\r
-    }\r
-\r
-} //class\r
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.pool;
+
+
+import java.sql.Connection;
+import java.sql.DriverPropertyInfo;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Properties;
+
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+/**
+ * @author Filip Hanik
+ * @version 1.0
+ */
+public class Driver implements java.sql.Driver {
+
+    protected static Log log = LogFactory.getLog(Driver.class);
+
+    protected static HashMap pooltable = new HashMap(11);
+
+    public Driver() throws SQLException {
+    }
+
+    public Driver(PoolProperties properties) throws SQLException {
+        init(properties);
+    } //Driver
+
+    public void init(PoolProperties properties) throws SQLException {
+        if (pooltable.get(properties.getPoolName()) != null)
+            throw new SQLException("Pool identified by:" + properties.getPoolName() + " already exists.");
+        ConnectionPool pool = new ConnectionPool(properties);
+        pooltable.put(properties.getPoolName(), pool);
+    }
+
+    public void closePool(String url, boolean all) throws SQLException {
+        ConnectionPool pool = (ConnectionPool) pooltable.get(url);
+        if (pool == null) {
+            throw new SQLException("No connection pool established for URL:" + url);
+        } else {
+            pool.close(all);
+        }
+        pooltable.remove(url);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Connection connect(String url, Properties info) throws SQLException {
+        ConnectionPool pool = (ConnectionPool) pooltable.get(url);
+        if (pool == null) {
+            throw new SQLException("No connection pool established for URL:" + url);
+        } else {
+            try {
+                return pool.getConnection();
+            } catch (SQLException forward) {
+                throw forward;
+            } catch (Exception e) {
+                throw new SQLException("Unknow pool exception:" + ConnectionPool.getStackTrace(e));
+            } //catch
+        } //end if
+    } //connect
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean acceptsURL(String url) throws SQLException {
+        /* check if the driver has a connection pool with that name */
+        return (pooltable.get(url) != null ? true : false);
+    } //acceptsUrl
+
+    /**
+     * {@inheritDoc}
+     */
+    public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws
+        SQLException {
+        return new DriverPropertyInfo[0];
+    } //getPropertyInfo
+
+    /**
+     * {@inheritDoc}
+     */
+    public int getMajorVersion() {
+        return 1;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public int getMinorVersion() {
+        return 0;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public boolean jdbcCompliant() {
+        return true;
+    }
+
+    public ConnectionPool getPool(String url) throws SQLException {
+        return (ConnectionPool) pooltable.get(url);
+    }
+
+} //class
index 67d1086..b48bf04 100644 (file)
@@ -1,51 +1,51 @@
-/*\r
- * Licensed to the Apache Software Foundation (ASF) under one or more\r
- * contributor license agreements.  See the NOTICE file distributed with\r
- * this work for additional information regarding copyright ownership.\r
- * The ASF licenses this file to You under the Apache License, Version 2.0\r
- * (the "License"); you may not use this file except in compliance with\r
- * the License.  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.apache.tomcat.jdbc.pool;\r
-\r
-import java.lang.reflect.InvocationHandler;\r
-import java.lang.reflect.Method;\r
-\r
-/**\r
- * @author Filip Hanik\r
- * @version 1.0\r
- */\r
-public abstract class JdbcInterceptor implements InvocationHandler {\r
-    public  static final String CLOSE_VAL = "close";\r
-\r
-    private JdbcInterceptor next = null;\r
-\r
-    public JdbcInterceptor() {\r
-    }\r
-\r
-    /**\r
-     * {@inheritDoc}\r
-     */\r
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {\r
-        if (getNext()!=null) return getNext().invoke(this,method,args);\r
-        else throw new NullPointerException();\r
-    }\r
-\r
-    public JdbcInterceptor getNext() {\r
-        return next;\r
-    }\r
-\r
-    public void setNext(JdbcInterceptor next) {\r
-        this.next = next;\r
-    }\r
-\r
-    public abstract void reset(ConnectionPool parent, PooledConnection con);\r
-}\r
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.pool;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+
+/**
+ * @author Filip Hanik
+ * @version 1.0
+ */
+public abstract class JdbcInterceptor implements InvocationHandler {
+    public  static final String CLOSE_VAL = "close";
+
+    private JdbcInterceptor next = null;
+
+    public JdbcInterceptor() {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        if (getNext()!=null) return getNext().invoke(this,method,args);
+        else throw new NullPointerException();
+    }
+
+    public JdbcInterceptor getNext() {
+        return next;
+    }
+
+    public void setNext(JdbcInterceptor next) {
+        this.next = next;
+    }
+
+    public abstract void reset(ConnectionPool parent, PooledConnection con);
+}
index 225ca48..1ddbc40 100644 (file)
-/*\r
- * Licensed to the Apache Software Foundation (ASF) under one or more\r
- * contributor license agreements.  See the NOTICE file distributed with\r
- * this work for additional information regarding copyright ownership.\r
- * The ASF licenses this file to You under the Apache License, Version 2.0\r
- * (the "License"); you may not use this file except in compliance with\r
- * the License.  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.apache.tomcat.jdbc.pool;\r
-\r
-\r
-import java.lang.reflect.Method;\r
-import java.util.Properties;\r
-/**\r
- * @author Filip Hanik\r
- *\r
- */\r
-public class PoolProperties {\r
-    protected static volatile int poolCounter = 1;\r
-    protected Properties dbProperties = new Properties();\r
-    protected String url = null;\r
-    protected String driverClassName = null;\r
-    protected Boolean defaultAutoCommit = null;\r
-    protected Boolean defaultReadOnly = null;\r
-    protected int defaultTransactionIsolation = DataSourceFactory.UNKNOWN_TRANSACTIONISOLATION;\r
-    protected String defaultCatalog = null;\r
-    protected String connectionProperties;\r
-    protected int initialSize = 10;\r
-    protected int maxActive = 100;\r
-    protected int maxIdle = maxActive;\r
-    protected int minIdle = initialSize;\r
-    protected int maxWait = 30000;\r
-    protected String validationQuery;\r
-    protected boolean testOnBorrow = false;\r
-    protected boolean testOnReturn = false;\r
-    protected boolean testWhileIdle = false;\r
-    protected int timeBetweenEvictionRunsMillis = 5000;\r
-    protected int numTestsPerEvictionRun;\r
-    protected int minEvictableIdleTimeMillis = 60000;\r
-    protected boolean accessToUnderlyingConnectionAllowed;\r
-    protected boolean removeAbandoned = false;\r
-    protected int removeAbandonedTimeout = 60;\r
-    protected boolean logAbandoned = false;\r
-    protected int loginTimeout = 10000;\r
-    protected String name = "Filip Connection Pool["+(poolCounter++)+"]";\r
-    protected String password;\r
-    protected String username;\r
-    protected long validationInterval = 30000;\r
-    protected boolean jmxEnabled = true;\r
-    protected String initSQL;\r
-    protected boolean testOnConnect =false;\r
-    private String jdbcInterceptors=null;\r
-    private boolean fairQueue = false;\r
-\r
-    public boolean isFairQueue() {\r
-        return fairQueue;\r
-    }\r
-\r
-    public void setFairQueue(boolean fairQueue) {\r
-        this.fairQueue = fairQueue;\r
-    }\r
-\r
-    public boolean isAccessToUnderlyingConnectionAllowed() {\r
-        return accessToUnderlyingConnectionAllowed;\r
-    }\r
-\r
-    public String getConnectionProperties() {\r
-        return connectionProperties;\r
-    }\r
-\r
-    public Properties getDbProperties() {\r
-        return dbProperties;\r
-    }\r
-\r
-    public boolean isDefaultAutoCommit() {\r
-        return defaultAutoCommit;\r
-    }\r
-\r
-    public String getDefaultCatalog() {\r
-        return defaultCatalog;\r
-    }\r
-\r
-    public boolean isDefaultReadOnly() {\r
-        return defaultReadOnly;\r
-    }\r
-\r
-    public int getDefaultTransactionIsolation() {\r
-        return defaultTransactionIsolation;\r
-    }\r
-\r
-    public String getDriverClassName() {\r
-        return driverClassName;\r
-    }\r
-\r
-    public int getInitialSize() {\r
-        return initialSize;\r
-    }\r
-\r
-    public boolean isLogAbandoned() {\r
-        return logAbandoned;\r
-    }\r
-\r
-    public int getLoginTimeout() {\r
-        return loginTimeout;\r
-    }\r
-\r
-    public int getMaxActive() {\r
-        return maxActive;\r
-    }\r
-\r
-    public int getMaxIdle() {\r
-        return maxIdle;\r
-    }\r
-\r
-    public int getMaxWait() {\r
-        return maxWait;\r
-    }\r
-\r
-    public int getMinEvictableIdleTimeMillis() {\r
-        return minEvictableIdleTimeMillis;\r
-    }\r
-\r
-    public int getMinIdle() {\r
-        return minIdle;\r
-    }\r
-\r
-    public String getName() {\r
-        return name;\r
-    }\r
-\r
-    public int getNumTestsPerEvictionRun() {\r
-        return numTestsPerEvictionRun;\r
-    }\r
-\r
-    public String getPassword() {\r
-        return password;\r
-    }\r
-\r
-    public String getPoolName() {\r
-        return getName();\r
-    }\r
-\r
-    public boolean isRemoveAbandoned() {\r
-        return removeAbandoned;\r
-    }\r
-\r
-    public int getRemoveAbandonedTimeout() {\r
-        return removeAbandonedTimeout;\r
-    }\r
-\r
-    public boolean isTestOnBorrow() {\r
-        return testOnBorrow;\r
-    }\r
-\r
-    public boolean isTestOnReturn() {\r
-        return testOnReturn;\r
-    }\r
-\r
-    public boolean isTestWhileIdle() {\r
-        return testWhileIdle;\r
-    }\r
-\r
-    public int getTimeBetweenEvictionRunsMillis() {\r
-        return timeBetweenEvictionRunsMillis;\r
-    }\r
-\r
-    public String getUrl() {\r
-        return url;\r
-    }\r
-\r
-    public String getUsername() {\r
-        return username;\r
-    }\r
-\r
-    public String getValidationQuery() {\r
-        return validationQuery;\r
-    }\r
-\r
-    public long getValidationInterval() {\r
-        return validationInterval;\r
-    }\r
-\r
-    public String getInitSQL() {\r
-        return initSQL;\r
-    }\r
-\r
-    public boolean isTestOnConnect() {\r
-        return testOnConnect;\r
-    }\r
-\r
-    public String getJdbcInterceptors() {\r
-        return jdbcInterceptors;\r
-    }\r
-\r
-    public String[] getJdbcInterceptorsAsArray() {\r
-        if (jdbcInterceptors==null) return new String[0];\r
-        else {\r
-            return jdbcInterceptors.split(";");\r
-        }\r
-    }\r
-\r
-    public void setAccessToUnderlyingConnectionAllowed(boolean\r
-        accessToUnderlyingConnectionAllowed) {\r
-        this.accessToUnderlyingConnectionAllowed =\r
-            accessToUnderlyingConnectionAllowed;\r
-    }\r
-\r
-    public void setConnectionProperties(String connectionProperties) {\r
-        this.connectionProperties = connectionProperties;\r
-    }\r
-\r
-    public void setDbProperties(Properties dbProperties) {\r
-        this.dbProperties = dbProperties;\r
-    }\r
-\r
-    public void setDefaultAutoCommit(Boolean defaultAutoCommit) {\r
-        this.defaultAutoCommit = defaultAutoCommit;\r
-    }\r
-\r
-    public void setDefaultCatalog(String defaultCatalog) {\r
-        this.defaultCatalog = defaultCatalog;\r
-    }\r
-\r
-    public void setDefaultReadOnly(Boolean defaultReadOnly) {\r
-        this.defaultReadOnly = defaultReadOnly;\r
-    }\r
-\r
-    public void setDefaultTransactionIsolation(int defaultTransactionIsolation) {\r
-        this.defaultTransactionIsolation = defaultTransactionIsolation;\r
-    }\r
-\r
-    public void setDriverClassName(String driverClassName) {\r
-        this.driverClassName = driverClassName;\r
-    }\r
-\r
-    public void setInitialSize(int initialSize) {\r
-        this.initialSize = initialSize;\r
-    }\r
-\r
-    public void setLogAbandoned(boolean logAbandoned) {\r
-        this.logAbandoned = logAbandoned;\r
-    }\r
-\r
-    public void setLoginTimeout(int loginTimeout) {\r
-        this.loginTimeout = loginTimeout;\r
-    }\r
-\r
-    public void setMaxActive(int maxActive) {\r
-        this.maxActive = maxActive;\r
-    }\r
-\r
-    public void setMaxIdle(int maxIdle) {\r
-        this.maxIdle = maxIdle;\r
-    }\r
-\r
-    public void setMaxWait(int maxWait) {\r
-        this.maxWait = maxWait;\r
-    }\r
-\r
-    public void setMinEvictableIdleTimeMillis(int minEvictableIdleTimeMillis) {\r
-        this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis;\r
-    }\r
-\r
-    public void setMinIdle(int minIdle) {\r
-        this.minIdle = minIdle;\r
-    }\r
-\r
-    public void setName(String name) {\r
-        this.name = name;\r
-    }\r
-\r
-    public void setNumTestsPerEvictionRun(int numTestsPerEvictionRun) {\r
-        this.numTestsPerEvictionRun = numTestsPerEvictionRun;\r
-    }\r
-\r
-    public void setPassword(String password) {\r
-        this.password = password;\r
-    }\r
-\r
-    public void setRemoveAbandoned(boolean removeAbandoned) {\r
-        this.removeAbandoned = removeAbandoned;\r
-    }\r
-\r
-    public void setRemoveAbandonedTimeout(int removeAbandonedTimeout) {\r
-        this.removeAbandonedTimeout = removeAbandonedTimeout;\r
-    }\r
-\r
-    public void setTestOnBorrow(boolean testOnBorrow) {\r
-        this.testOnBorrow = testOnBorrow;\r
-    }\r
-\r
-    public void setTestWhileIdle(boolean testWhileIdle) {\r
-        this.testWhileIdle = testWhileIdle;\r
-    }\r
-\r
-    public void setTestOnReturn(boolean testOnReturn) {\r
-        this.testOnReturn = testOnReturn;\r
-    }\r
-\r
-    public void setTimeBetweenEvictionRunsMillis(int\r
-                                                 timeBetweenEvictionRunsMillis) {\r
-        this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis;\r
-    }\r
-\r
-    public void setUrl(String url) {\r
-        this.url = url;\r
-    }\r
-\r
-    public void setUsername(String username) {\r
-        this.username = username;\r
-    }\r
-\r
-    public void setValidationInterval(long validationInterval) {\r
-        this.validationInterval = validationInterval;\r
-    }\r
-\r
-    public void setValidationQuery(String validationQuery) {\r
-        this.validationQuery = validationQuery;\r
-    }\r
-\r
-    public void setInitSQL(String initSQL) {\r
-        this.initSQL = initSQL;\r
-    }\r
-\r
-    public void setTestOnConnect(boolean testOnConnect) {\r
-        this.testOnConnect = testOnConnect;\r
-    }\r
-\r
-    public void setJdbcInterceptors(String jdbcInterceptors) {\r
-        this.jdbcInterceptors = jdbcInterceptors;\r
-    }\r
-\r
-    public String toString() {\r
-        StringBuffer buf = new StringBuffer("ConnectionPool[");\r
-        try {\r
-            String[] fields = DataSourceFactory.ALL_PROPERTIES;\r
-            for (int i=0; i<fields.length; i++) {\r
-                final String[] prefix = new String[] {"get","is"};\r
-                for (int j=0; j<prefix.length; j++) {\r
-\r
-                    String name = prefix[j] + fields[i].substring(0, 1).toUpperCase() +\r
-                                  fields[i].substring(1);\r
-                    Method m = null;\r
-                    try {\r
-                        m = getClass().getMethod(name);\r
-                    }catch (NoSuchMethodException nm) {\r
-                        continue;\r
-                    }\r
-                    buf.append(fields[i]);\r
-                    buf.append("=");\r
-                    buf.append(m.invoke(this, new Object[0]));\r
-                    buf.append("; ");\r
-                    break;\r
-                }\r
-            }\r
-        }catch (Exception x) {\r
-            //shouldn;t happen\r
-            x.printStackTrace();\r
-        }\r
-        return buf.toString();\r
-    }\r
-\r
-    public static int getPoolCounter() {\r
-        return poolCounter;\r
-    }\r
-\r
-    public boolean isJmxEnabled() {\r
-        return jmxEnabled;\r
-    }\r
-\r
-    public void setJmxEnabled(boolean jmxEnabled) {\r
-        this.jmxEnabled = jmxEnabled;\r
-    }\r
-\r
-    public Boolean getDefaultAutoCommit() {\r
-        return defaultAutoCommit;\r
-    }\r
-\r
-    public Boolean getDefaultReadOnly() {\r
-        return defaultReadOnly;\r
-    }\r
-    \r
-    public boolean isPoolSweeperEnabled() {\r
-        boolean result = getTimeBetweenEvictionRunsMillis()>0;\r
-        result = result && (isRemoveAbandoned() && getRemoveAbandonedTimeout()>0);\r
-        result = result && (isTestWhileIdle() && getValidationQuery()!=null);\r
-        return result;\r
-    }\r
-}\r
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.pool;
+
+
+import java.lang.reflect.Method;
+import java.util.Properties;
+/**
+ * @author Filip Hanik
+ *
+ */
+public class PoolProperties {
+    protected static volatile int poolCounter = 1;
+    protected Properties dbProperties = new Properties();
+    protected String url = null;
+    protected String driverClassName = null;
+    protected Boolean defaultAutoCommit = null;
+    protected Boolean defaultReadOnly = null;
+    protected int defaultTransactionIsolation = DataSourceFactory.UNKNOWN_TRANSACTIONISOLATION;
+    protected String defaultCatalog = null;
+    protected String connectionProperties;
+    protected int initialSize = 10;
+    protected int maxActive = 100;
+    protected int maxIdle = maxActive;
+    protected int minIdle = initialSize;
+    protected int maxWait = 30000;
+    protected String validationQuery;
+    protected boolean testOnBorrow = false;
+    protected boolean testOnReturn = false;
+    protected boolean testWhileIdle = false;
+    protected int timeBetweenEvictionRunsMillis = 5000;
+    protected int numTestsPerEvictionRun;
+    protected int minEvictableIdleTimeMillis = 60000;
+    protected boolean accessToUnderlyingConnectionAllowed;
+    protected boolean removeAbandoned = false;
+    protected int removeAbandonedTimeout = 60;
+    protected boolean logAbandoned = false;
+    protected int loginTimeout = 10000;
+    protected String name = "Filip Connection Pool["+(poolCounter++)+"]";
+    protected String password;
+    protected String username;
+    protected long validationInterval = 30000;
+    protected boolean jmxEnabled = true;
+    protected String initSQL;
+    protected boolean testOnConnect =false;
+    private String jdbcInterceptors=null;
+    private boolean fairQueue = false;
+
+    public boolean isFairQueue() {
+        return fairQueue;
+    }
+
+    public void setFairQueue(boolean fairQueue) {
+        this.fairQueue = fairQueue;
+    }
+
+    public boolean isAccessToUnderlyingConnectionAllowed() {
+        return accessToUnderlyingConnectionAllowed;
+    }
+
+    public String getConnectionProperties() {
+        return connectionProperties;
+    }
+
+    public Properties getDbProperties() {
+        return dbProperties;
+    }
+
+    public boolean isDefaultAutoCommit() {
+        return defaultAutoCommit;
+    }
+
+    public String getDefaultCatalog() {
+        return defaultCatalog;
+    }
+
+    public boolean isDefaultReadOnly() {
+        return defaultReadOnly;
+    }
+
+    public int getDefaultTransactionIsolation() {
+        return defaultTransactionIsolation;
+    }
+
+    public String getDriverClassName() {
+        return driverClassName;
+    }
+
+    public int getInitialSize() {
+        return initialSize;
+    }
+
+    public boolean isLogAbandoned() {
+        return logAbandoned;
+    }
+
+    public int getLoginTimeout() {
+        return loginTimeout;
+    }
+
+    public int getMaxActive() {
+        return maxActive;
+    }
+
+    public int getMaxIdle() {
+        return maxIdle;
+    }
+
+    public int getMaxWait() {
+        return maxWait;
+    }
+
+    public int getMinEvictableIdleTimeMillis() {
+        return minEvictableIdleTimeMillis;
+    }
+
+    public int getMinIdle() {
+        return minIdle;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getNumTestsPerEvictionRun() {
+        return numTestsPerEvictionRun;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public String getPoolName() {
+        return getName();
+    }
+
+    public boolean isRemoveAbandoned() {
+        return removeAbandoned;
+    }
+
+    public int getRemoveAbandonedTimeout() {
+        return removeAbandonedTimeout;
+    }
+
+    public boolean isTestOnBorrow() {
+        return testOnBorrow;
+    }
+
+    public boolean isTestOnReturn() {
+        return testOnReturn;
+    }
+
+    public boolean isTestWhileIdle() {
+        return testWhileIdle;
+    }
+
+    public int getTimeBetweenEvictionRunsMillis() {
+        return timeBetweenEvictionRunsMillis;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getValidationQuery() {
+        return validationQuery;
+    }
+
+    public long getValidationInterval() {
+        return validationInterval;
+    }
+
+    public String getInitSQL() {
+        return initSQL;
+    }
+
+    public boolean isTestOnConnect() {
+        return testOnConnect;
+    }
+
+    public String getJdbcInterceptors() {
+        return jdbcInterceptors;
+    }
+
+    public String[] getJdbcInterceptorsAsArray() {
+        if (jdbcInterceptors==null) return new String[0];
+        else {
+            return jdbcInterceptors.split(";");
+        }
+    }
+
+    public void setAccessToUnderlyingConnectionAllowed(boolean
+        accessToUnderlyingConnectionAllowed) {
+        this.accessToUnderlyingConnectionAllowed =
+            accessToUnderlyingConnectionAllowed;
+    }
+
+    public void setConnectionProperties(String connectionProperties) {
+        this.connectionProperties = connectionProperties;
+    }
+
+    public void setDbProperties(Properties dbProperties) {
+        this.dbProperties = dbProperties;
+    }
+
+    public void setDefaultAutoCommit(Boolean defaultAutoCommit) {
+        this.defaultAutoCommit = defaultAutoCommit;
+    }
+
+    public void setDefaultCatalog(String defaultCatalog) {
+        this.defaultCatalog = defaultCatalog;
+    }
+
+    public void setDefaultReadOnly(Boolean defaultReadOnly) {
+        this.defaultReadOnly = defaultReadOnly;
+    }
+
+    public void setDefaultTransactionIsolation(int defaultTransactionIsolation) {
+        this.defaultTransactionIsolation = defaultTransactionIsolation;
+    }
+
+    public void setDriverClassName(String driverClassName) {
+        this.driverClassName = driverClassName;
+    }
+
+    public void setInitialSize(int initialSize) {
+        this.initialSize = initialSize;
+    }
+
+    public void setLogAbandoned(boolean logAbandoned) {
+        this.logAbandoned = logAbandoned;
+    }
+
+    public void setLoginTimeout(int loginTimeout) {
+        this.loginTimeout = loginTimeout;
+    }
+
+    public void setMaxActive(int maxActive) {
+        this.maxActive = maxActive;
+    }
+
+    public void setMaxIdle(int maxIdle) {
+        this.maxIdle = maxIdle;
+    }
+
+    public void setMaxWait(int maxWait) {
+        this.maxWait = maxWait;
+    }
+
+    public void setMinEvictableIdleTimeMillis(int minEvictableIdleTimeMillis) {
+        this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis;
+    }
+
+    public void setMinIdle(int minIdle) {
+        this.minIdle = minIdle;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setNumTestsPerEvictionRun(int numTestsPerEvictionRun) {
+        this.numTestsPerEvictionRun = numTestsPerEvictionRun;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public void setRemoveAbandoned(boolean removeAbandoned) {
+        this.removeAbandoned = removeAbandoned;
+    }
+
+    public void setRemoveAbandonedTimeout(int removeAbandonedTimeout) {
+        this.removeAbandonedTimeout = removeAbandonedTimeout;
+    }
+
+    public void setTestOnBorrow(boolean testOnBorrow) {
+        this.testOnBorrow = testOnBorrow;
+    }
+
+    public void setTestWhileIdle(boolean testWhileIdle) {
+        this.testWhileIdle = testWhileIdle;
+    }
+
+    public void setTestOnReturn(boolean testOnReturn) {
+        this.testOnReturn = testOnReturn;
+    }
+
+    public void setTimeBetweenEvictionRunsMillis(int
+                                                 timeBetweenEvictionRunsMillis) {
+        this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public void setValidationInterval(long validationInterval) {
+        this.validationInterval = validationInterval;
+    }
+
+    public void setValidationQuery(String validationQuery) {
+        this.validationQuery = validationQuery;
+    }
+
+    public void setInitSQL(String initSQL) {
+        this.initSQL = initSQL;
+    }
+
+    public void setTestOnConnect(boolean testOnConnect) {
+        this.testOnConnect = testOnConnect;
+    }
+
+    public void setJdbcInterceptors(String jdbcInterceptors) {
+        this.jdbcInterceptors = jdbcInterceptors;
+    }
+
+    public String toString() {
+        StringBuffer buf = new StringBuffer("ConnectionPool[");
+        try {
+            String[] fields = DataSourceFactory.ALL_PROPERTIES;
+            for (int i=0; i<fields.length; i++) {
+                final String[] prefix = new String[] {"get","is"};
+                for (int j=0; j<prefix.length; j++) {
+
+                    String name = prefix[j] + fields[i].substring(0, 1).toUpperCase() +
+                                  fields[i].substring(1);
+                    Method m = null;
+                    try {
+                        m = getClass().getMethod(name);
+                    }catch (NoSuchMethodException nm) {
+                        continue;
+                    }
+                    buf.append(fields[i]);
+                    buf.append("=");
+                    buf.append(m.invoke(this, new Object[0]));
+                    buf.append("; ");
+                    break;
+                }
+            }
+        }catch (Exception x) {
+            //shouldn;t happen
+            x.printStackTrace();
+        }
+        return buf.toString();
+    }
+
+    public static int getPoolCounter() {
+        return poolCounter;
+    }
+
+    public boolean isJmxEnabled() {
+        return jmxEnabled;
+    }
+
+    public void setJmxEnabled(boolean jmxEnabled) {
+        this.jmxEnabled = jmxEnabled;
+    }
+
+    public Boolean getDefaultAutoCommit() {
+        return defaultAutoCommit;
+    }
+
+    public Boolean getDefaultReadOnly() {
+        return defaultReadOnly;
+    }
+    
+    public boolean isPoolSweeperEnabled() {
+        boolean result = getTimeBetweenEvictionRunsMillis()>0;
+        result = result && (isRemoveAbandoned() && getRemoveAbandonedTimeout()>0);
+        result = result && (isTestWhileIdle() && getValidationQuery()!=null);
+        return result;
+    }
+}
index 045aa83..27767dd 100644 (file)
-/*\r
- * Licensed to the Apache Software Foundation (ASF) under one or more\r
- * contributor license agreements.  See the NOTICE file distributed with\r
- * this work for additional information regarding copyright ownership.\r
- * The ASF licenses this file to You under the Apache License, Version 2.0\r
- * (the "License"); you may not use this file except in compliance with\r
- * the License.  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.apache.tomcat.jdbc.pool;\r
-\r
-\r
-import java.lang.ref.WeakReference;\r
-import java.sql.SQLException;\r
-import java.sql.Statement;\r
-import java.util.concurrent.locks.ReentrantReadWriteLock;\r
-\r
-import org.apache.juli.logging.Log;\r
-import org.apache.juli.logging.LogFactory;\r
-import java.util.concurrent.atomic.AtomicInteger;\r
-\r
-/**\r
- * @author Filip Hanik\r
- * @version 1.0\r
- */\r
-public class PooledConnection {\r
-\r
-    public static final int VALIDATE_BORROW = 1;\r
-    public static final int VALIDATE_RETURN = 2;\r
-    public static final int VALIDATE_IDLE = 3;\r
-    public static final int VALIDATE_INIT = 4;\r
-\r
-    protected static Log log = LogFactory.getLog(PooledConnection.class);\r
-    protected static volatile int counter = 1;\r
-\r
-    protected PoolProperties poolProperties;\r
-    protected java.sql.Connection connection;\r
-    protected String abandonTrace = null;\r
-    protected long timestamp;\r
-    protected ReentrantReadWriteLock lock = new ReentrantReadWriteLock(false);\r
-    protected boolean discarded = false;\r
-    protected long lastValidated = System.currentTimeMillis();\r
-    protected int instanceCount = 0;\r
-    protected ConnectionPool parent;\r
-\r
-    protected WeakReference<JdbcInterceptor> handler = null;\r
-\r
-    public PooledConnection(PoolProperties prop, ConnectionPool parent) throws SQLException {\r
-        instanceCount = counter++;\r
-        poolProperties = prop;\r
-        this.parent = parent;\r
-    }\r
-\r
-    protected void connect() throws SQLException {\r
-        if (connection != null) {\r
-            try {\r
-                this.disconnect(false);\r
-            } catch (Exception x) {\r
-                log.error("Unable to disconnect previous connection.", x);\r
-            } //catch\r
-        } //end if\r
-        java.sql.Driver driver = null;\r
-        try {\r
-            driver = (java.sql.Driver) Class.forName(poolProperties.getDriverClassName(),\r
-                                                     true, PooledConnection.class.getClassLoader()).newInstance();\r
-        } catch (java.lang.Exception cn) {\r
-            log.error("Unable to instantiate JDBC driver.", cn);\r
-            throw new SQLException(cn.getMessage());\r
-        }\r
-        String driverURL = poolProperties.getUrl();\r
-        String usr = poolProperties.getUsername();\r
-        String pwd = poolProperties.getPassword();\r
-        poolProperties.getDbProperties().setProperty("user", usr);\r
-        poolProperties.getDbProperties().setProperty("password", pwd);\r
-        connection = driver.connect(driverURL, poolProperties.getDbProperties());\r
-        //set up the default state\r
-        if (poolProperties.getDefaultReadOnly()!=null) connection.setReadOnly(poolProperties.getDefaultReadOnly().booleanValue());\r
-        if (poolProperties.getDefaultAutoCommit()!=null) connection.setAutoCommit(poolProperties.getDefaultAutoCommit().booleanValue());\r
-        if (poolProperties.getDefaultCatalog()!=null) connection.setCatalog(poolProperties.getDefaultCatalog());\r
-        if (poolProperties.getDefaultTransactionIsolation()!=DataSourceFactory.UNKNOWN_TRANSACTIONISOLATION) connection.setTransactionIsolation(poolProperties.getDefaultTransactionIsolation());\r
-        \r
-        this.discarded = false;\r
-    }\r
-\r
-    protected void reconnect() throws SQLException {\r
-        this.disconnect(false);\r
-        this.connect();\r
-    } //reconnect\r
-\r
-    protected synchronized void disconnect(boolean finalize) throws SQLException {\r
-        if (isDiscarded()) {\r
-            return;\r
-        }\r
-        setDiscarded(true);\r
-        if (connection != null) {\r
-            connection.close();\r
-        }\r
-        connection = null;\r
-        if (finalize) parent.finalize(this);\r
-    }\r
-\r
-\r
-//============================================================================\r
-//             com.filip.util.IPoolObject methods\r
-//============================================================================\r
-\r
-    public long getAbandonTimeout() {\r
-        if (poolProperties.getRemoveAbandonedTimeout() <= 0) {\r
-            return Long.MAX_VALUE;\r
-        } else {\r
-            return poolProperties.getRemoveAbandonedTimeout()*1000;\r
-        } //end if\r
-    }\r
-\r
-    public boolean abandon() {\r
-        try {\r
-            disconnect(true);\r
-        } catch (SQLException x) {\r
-            log.error("", x);\r
-        } //catch\r
-        return false;\r
-    }\r
-\r
-    protected boolean doValidate(int action) {\r
-        if (action == PooledConnection.VALIDATE_BORROW &&\r
-            poolProperties.isTestOnBorrow())\r
-            return true;\r
-        else if (action == PooledConnection.VALIDATE_RETURN &&\r
-                 poolProperties.isTestOnReturn())\r
-            return true;\r
-        else if (action == PooledConnection.VALIDATE_IDLE &&\r
-                 poolProperties.isTestWhileIdle())\r
-            return true;\r
-        else if (action == PooledConnection.VALIDATE_INIT &&\r
-                 poolProperties.isTestOnConnect())\r
-            return true;\r
-        else if (action == PooledConnection.VALIDATE_INIT &&\r
-                 poolProperties.getInitSQL()!=null)\r
-           return true;\r
-        else\r
-            return false;\r
-    }\r
-\r
-    /**Returns true if the object is still valid. if not\r
-     * the pool will call the getExpiredAction() and follow up with one\r
-     * of the four expired methods\r
-     */\r
-    public boolean validate(int validateAction) {\r
-        return validate(validateAction,null);\r
-    }\r
-\r
-    public boolean validate(int validateAction,String sql) {\r
-        if (this.isDiscarded()) {\r
-            return false;\r
-        }\r
-        \r
-        if (!doValidate(validateAction)) {\r
-            //no validation required, no init sql and props not set\r
-            return true;\r
-        }\r
-\r
-        String query = (VALIDATE_INIT==validateAction && (poolProperties.getInitSQL()!=null))?poolProperties.getInitSQL():sql;\r
-\r
-        if (query==null) query = poolProperties.getValidationQuery();\r
-\r
-        if (query == null) {\r
-            //no validation possible\r
-            return true;\r
-        }\r
-        long now = System.currentTimeMillis();\r
-        if (this.poolProperties.getValidationInterval() > 0 &&\r
-            (now - this.lastValidated) <\r
-            this.poolProperties.getValidationInterval()) {\r
-            return true;\r
-        }\r
-        try {\r
-            Statement stmt = connection.createStatement();\r
-            boolean exec = stmt.execute(query);\r
-            stmt.close();\r
-            this.lastValidated = now;\r
-            return true;\r
-        } catch (Exception ignore) {\r
-            if (log.isDebugEnabled())\r
-                log.debug("Unable to validate object:",ignore);\r
-        }\r
-        return false;\r
-    } //validate\r
-\r
-    /**\r
-     * The time limit for how long the object\r
-     * can remain unused before it is released\r
-     */\r
-    public long getReleaseTime() {\r
-        return this.poolProperties.getMinEvictableIdleTimeMillis();\r
-    }\r
-\r
-    /**\r
-     * This method is called if (Now - timeCheckedIn > getReleaseTime())\r
-     */\r
-    public void release() {\r
-        try {\r
-            disconnect(true);\r
-        } catch (SQLException x) {\r
-            if (log.isDebugEnabled()) {\r
-                log.debug("Unable to close SQL connection",x);\r
-            }\r
-        } catch (Exception x) {\r
-            if (log.isDebugEnabled()) {\r
-                log.debug("Unable to close SQL connection",x);\r
-            }\r
-        }\r
-\r
-    }\r
-\r
-    /**\r
-     * The pool will set the stack trace when it is check out and\r
-     * checked in\r
-     */\r
-\r
-    public void setStackTrace(String trace) {\r
-        abandonTrace = trace;\r
-    }\r
-\r
-    public String getStackTrace() {\r
-        return abandonTrace;\r
-    }\r
-\r
-    public void setTimestamp(long timestamp) {\r
-        this.timestamp = timestamp;\r
-    }\r
-\r
-    public void setDiscarded(boolean discarded) {\r
-        if (this.discarded && !discarded) throw new IllegalStateException("Unable to change the state once the connection has been discarded");\r
-        this.discarded = discarded;\r
-    }\r
-\r
-    public void setLastValidated(long lastValidated) {\r
-        this.lastValidated = lastValidated;\r
-    }\r
-\r
-    public void setPoolProperties(PoolProperties poolProperties) {\r
-        this.poolProperties = poolProperties;\r
-    }\r
-\r
-    public long getTimestamp() {\r
-        return timestamp;\r
-    }\r
-\r
-    public boolean isDiscarded() {\r
-        return discarded;\r
-    }\r
-\r
-    public long getLastValidated() {\r
-        return lastValidated;\r
-    }\r
-\r
-    public PoolProperties getPoolProperties() {\r
-        return poolProperties;\r
-    }\r
-\r
-    public void lock() {\r
-        if (this.poolProperties.isPoolSweeperEnabled()) {\r
-            //optimized, only use a lock when there is concurrency\r
-            lock.writeLock().lock();\r
-        }\r
-    }\r
-\r
-    public void unlock() {\r
-        if (this.poolProperties.isPoolSweeperEnabled()) {\r
-          //optimized, only use a lock when there is concurrency\r
-            lock.writeLock().unlock();\r
-        }\r
-    }\r
-\r
-    public java.sql.Connection getConnection() {\r
-        return this.connection;\r
-    }\r
-\r
-    public JdbcInterceptor getHandler() {\r
-        return (handler!=null)?handler.get():null;\r
-    }\r
-\r
-    public void setHandler(JdbcInterceptor handler) {\r
-        if (handler==null) {\r
-            if (this.handler!=null) this.handler.clear();\r
-        } else if (this.handler==null) {\r
-            this.handler = new WeakReference<JdbcInterceptor>(handler);\r
-        } else if (this.handler.get()==null) {\r
-            this.handler.clear();\r
-            this.handler = new WeakReference<JdbcInterceptor>(handler);\r
-        } else if (this.handler.get()!=handler) {\r
-            this.handler.clear();\r
-            this.handler = new WeakReference<JdbcInterceptor>(handler);\r
-        }\r
-    }\r
-\r
-}\r
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.pool;
+
+
+import java.lang.ref.WeakReference;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @author Filip Hanik
+ * @version 1.0
+ */
+public class PooledConnection {
+
+    public static final int VALIDATE_BORROW = 1;
+    public static final int VALIDATE_RETURN = 2;
+    public static final int VALIDATE_IDLE = 3;
+    public static final int VALIDATE_INIT = 4;
+
+    protected static Log log = LogFactory.getLog(PooledConnection.class);
+    protected static volatile int counter = 1;
+
+    protected PoolProperties poolProperties;
+    protected java.sql.Connection connection;
+    protected String abandonTrace = null;
+    protected long timestamp;
+    protected ReentrantReadWriteLock lock = new ReentrantReadWriteLock(false);
+    protected boolean discarded = false;
+    protected long lastValidated = System.currentTimeMillis();
+    protected int instanceCount = 0;
+    protected ConnectionPool parent;
+
+    protected WeakReference<JdbcInterceptor> handler = null;
+
+    public PooledConnection(PoolProperties prop, ConnectionPool parent) throws SQLException {
+        instanceCount = counter++;
+        poolProperties = prop;
+        this.parent = parent;
+    }
+
+    protected void connect() throws SQLException {
+        if (connection != null) {
+            try {
+                this.disconnect(false);
+            } catch (Exception x) {
+                log.error("Unable to disconnect previous connection.", x);
+            } //catch
+        } //end if
+        java.sql.Driver driver = null;
+        try {
+            driver = (java.sql.Driver) Class.forName(poolProperties.getDriverClassName(),
+                                                     true, PooledConnection.class.getClassLoader()).newInstance();
+        } catch (java.lang.Exception cn) {
+            log.error("Unable to instantiate JDBC driver.", cn);
+            throw new SQLException(cn.getMessage());
+        }
+        String driverURL = poolProperties.getUrl();
+        String usr = poolProperties.getUsername();
+        String pwd = poolProperties.getPassword();
+        poolProperties.getDbProperties().setProperty("user", usr);
+        poolProperties.getDbProperties().setProperty("password", pwd);
+        connection = driver.connect(driverURL, poolProperties.getDbProperties());
+        //set up the default state
+        if (poolProperties.getDefaultReadOnly()!=null) connection.setReadOnly(poolProperties.getDefaultReadOnly().booleanValue());
+        if (poolProperties.getDefaultAutoCommit()!=null) connection.setAutoCommit(poolProperties.getDefaultAutoCommit().booleanValue());
+        if (poolProperties.getDefaultCatalog()!=null) connection.setCatalog(poolProperties.getDefaultCatalog());
+        if (poolProperties.getDefaultTransactionIsolation()!=DataSourceFactory.UNKNOWN_TRANSACTIONISOLATION) connection.setTransactionIsolation(poolProperties.getDefaultTransactionIsolation());
+        
+        this.discarded = false;
+    }
+
+    protected void reconnect() throws SQLException {
+        this.disconnect(false);
+        this.connect();
+    } //reconnect
+
+    protected synchronized void disconnect(boolean finalize) throws SQLException {
+        if (isDiscarded()) {
+            return;
+        }
+        setDiscarded(true);
+        if (connection != null) {
+            connection.close();
+        }
+        connection = null;
+        if (finalize) parent.finalize(this);
+    }
+
+
+//============================================================================
+//             com.filip.util.IPoolObject methods
+//============================================================================
+
+    public long getAbandonTimeout() {
+        if (poolProperties.getRemoveAbandonedTimeout() <= 0) {
+            return Long.MAX_VALUE;
+        } else {
+            return poolProperties.getRemoveAbandonedTimeout()*1000;
+        } //end if
+    }
+
+    public boolean abandon() {
+        try {
+            disconnect(true);
+        } catch (SQLException x) {
+            log.error("", x);
+        } //catch
+        return false;
+    }
+
+    protected boolean doValidate(int action) {
+        if (action == PooledConnection.VALIDATE_BORROW &&
+            poolProperties.isTestOnBorrow())
+            return true;
+        else if (action == PooledConnection.VALIDATE_RETURN &&
+                 poolProperties.isTestOnReturn())
+            return true;
+        else if (action == PooledConnection.VALIDATE_IDLE &&
+                 poolProperties.isTestWhileIdle())
+            return true;
+        else if (action == PooledConnection.VALIDATE_INIT &&
+                 poolProperties.isTestOnConnect())
+            return true;
+        else if (action == PooledConnection.VALIDATE_INIT &&
+                 poolProperties.getInitSQL()!=null)
+           return true;
+        else
+            return false;
+    }
+
+    /**Returns true if the object is still valid. if not
+     * the pool will call the getExpiredAction() and follow up with one
+     * of the four expired methods
+     */
+    public boolean validate(int validateAction) {
+        return validate(validateAction,null);
+    }
+
+    public boolean validate(int validateAction,String sql) {
+        if (this.isDiscarded()) {
+            return false;
+        }
+        
+        if (!doValidate(validateAction)) {
+            //no validation required, no init sql and props not set
+            return true;
+        }
+
+        String query = (VALIDATE_INIT==validateAction && (poolProperties.getInitSQL()!=null))?poolProperties.getInitSQL():sql;
+
+        if (query==null) query = poolProperties.getValidationQuery();
+
+        if (query == null) {
+            //no validation possible
+            return true;
+        }
+        long now = System.currentTimeMillis();
+        if (this.poolProperties.getValidationInterval() > 0 &&
+            (now - this.lastValidated) <
+            this.poolProperties.getValidationInterval()) {
+            return true;
+        }
+        try {
+            Statement stmt = connection.createStatement();
+            boolean exec = stmt.execute(query);
+            stmt.close();
+            this.lastValidated = now;
+            return true;
+        } catch (Exception ignore) {
+            if (log.isDebugEnabled())
+                log.debug("Unable to validate object:",ignore);
+        }
+        return false;
+    } //validate
+
+    /**
+     * The time limit for how long the object
+     * can remain unused before it is released
+     */
+    public long getReleaseTime() {
+        return this.poolProperties.getMinEvictableIdleTimeMillis();
+    }
+
+    /**
+     * This method is called if (Now - timeCheckedIn > getReleaseTime())
+     */
+    public void release() {
+        try {
+            disconnect(true);
+        } catch (SQLException x) {
+            if (log.isDebugEnabled()) {
+                log.debug("Unable to close SQL connection",x);
+            }
+        } catch (Exception x) {
+            if (log.isDebugEnabled()) {
+                log.debug("Unable to close SQL connection",x);
+            }
+        }
+
+    }
+
+    /**
+     * The pool will set the stack trace when it is check out and
+     * checked in
+     */
+
+    public void setStackTrace(String trace) {
+        abandonTrace = trace;
+    }
+
+    public String getStackTrace() {
+        return abandonTrace;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public void setDiscarded(boolean discarded) {
+        if (this.discarded && !discarded) throw new IllegalStateException("Unable to change the state once the connection has been discarded");
+        this.discarded = discarded;
+    }
+
+    public void setLastValidated(long lastValidated) {
+        this.lastValidated = lastValidated;
+    }
+
+    public void setPoolProperties(PoolProperties poolProperties) {
+        this.poolProperties = poolProperties;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public boolean isDiscarded() {
+        return discarded;
+    }
+
+    public long getLastValidated() {
+        return lastValidated;
+    }
+
+    public PoolProperties getPoolProperties() {
+        return poolProperties;
+    }
+
+    public void lock() {
+        if (this.poolProperties.isPoolSweeperEnabled()) {
+            //optimized, only use a lock when there is concurrency
+            lock.writeLock().lock();
+        }
+    }
+
+    public void unlock() {
+        if (this.poolProperties.isPoolSweeperEnabled()) {
+          //optimized, only use a lock when there is concurrency
+            lock.writeLock().unlock();
+        }
+    }
+
+    public java.sql.Connection getConnection() {
+        return this.connection;
+    }
+
+    public JdbcInterceptor getHandler() {
+        return (handler!=null)?handler.get():null;
+    }
+
+    public void setHandler(JdbcInterceptor handler) {
+        if (handler==null) {
+            if (this.handler!=null) this.handler.clear();
+        } else if (this.handler==null) {
+            this.handler = new WeakReference<JdbcInterceptor>(handler);
+        } else if (this.handler.get()==null) {
+            this.handler.clear();
+            this.handler = new WeakReference<JdbcInterceptor>(handler);
+        } else if (this.handler.get()!=handler) {
+            this.handler.clear();
+            this.handler = new WeakReference<JdbcInterceptor>(handler);
+        }
+    }
+
+}
index 9a66536..feba58f 100644 (file)
@@ -1,93 +1,93 @@
-/*\r
- * Licensed to the Apache Software Foundation (ASF) under one or more\r
- * contributor license agreements.  See the NOTICE file distributed with\r
- * this work for additional information regarding copyright ownership.\r
- * The ASF licenses this file to You under the Apache License, Version 2.0\r
- * (the "License"); you may not use this file except in compliance with\r
- * the License.  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.apache.tomcat.jdbc.pool;\r
-\r
-import java.lang.reflect.Method;\r
-import java.sql.Connection;\r
-import java.sql.SQLException;\r
-/**\r
- * @author Filip Hanik\r
- */\r
-public class ProxyConnection extends JdbcInterceptor {\r
-\r
-    protected PooledConnection connection = null;\r
-\r
-    protected ConnectionPool pool = null;\r
-\r
-    public PooledConnection getConnection() {\r
-        return connection;\r
-    }\r
-\r
-    public void setConnection(PooledConnection connection) {\r
-        this.connection = connection;\r
-    }\r
-\r
-    public ConnectionPool getPool() {\r
-        return pool;\r
-    }\r
-\r
-    public void setPool(ConnectionPool pool) {\r
-        this.pool = pool;\r
-    }\r
-\r
-    protected ProxyConnection(ConnectionPool parent, PooledConnection con) throws SQLException {\r
-        pool = parent;\r
-        connection = con;\r
-    }\r
-\r
-    public void reset(ConnectionPool parent, PooledConnection con) {\r
-        this.pool = parent;\r
-        this.connection = con;\r
-    }\r
-\r
-    public boolean isWrapperFor(Class<?> iface) throws SQLException {\r
-        return (iface.isInstance(connection.getConnection()));\r
-    }\r
-\r
-\r
-    public Object unwrap(Class iface) throws SQLException {\r
-        if (isWrapperFor(iface)) {\r
-            return connection.getConnection();\r
-        } else {\r
-            throw new SQLException("Not a wrapper of "+iface.getName());\r
-        }\r
-    }\r
-\r
-    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {\r
-        if (isClosed()) throw new SQLException("Connection has already been closed.");\r
-        if (CLOSE_VAL==method.getName()) {\r
-            PooledConnection poolc = this.connection;\r
-            this.connection = null;\r
-            pool.returnConnection(poolc);\r
-            return null;\r
-        }\r
-        return method.invoke(connection.getConnection(),args);\r
-    }\r
-\r
-    public boolean isClosed() {\r
-        return connection==null || connection.isDiscarded();\r
-    }\r
-\r
-    public PooledConnection getDelegateConnection() {\r
-        return connection;\r
-    }\r
-\r
-    public ConnectionPool getParentPool() {\r
-        return pool;\r
-    }\r
-\r
-}\r
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.pool;
+
+import java.lang.reflect.Method;
+import java.sql.Connection;
+import java.sql.SQLException;
+/**
+ * @author Filip Hanik
+ */
+public class ProxyConnection extends JdbcInterceptor {
+
+    protected PooledConnection connection = null;
+
+    protected ConnectionPool pool = null;
+
+    public PooledConnection getConnection() {
+        return connection;
+    }
+
+    public void setConnection(PooledConnection connection) {
+        this.connection = connection;
+    }
+
+    public ConnectionPool getPool() {
+        return pool;
+    }
+
+    public void setPool(ConnectionPool pool) {
+        this.pool = pool;
+    }
+
+    protected ProxyConnection(ConnectionPool parent, PooledConnection con) throws SQLException {
+        pool = parent;
+        connection = con;
+    }
+
+    public void reset(ConnectionPool parent, PooledConnection con) {
+        this.pool = parent;
+        this.connection = con;
+    }
+
+    public boolean isWrapperFor(Class<?> iface) throws SQLException {
+        return (iface.isInstance(connection.getConnection()));
+    }
+
+
+    public Object unwrap(Class iface) throws SQLException {
+        if (isWrapperFor(iface)) {
+            return connection.getConnection();
+        } else {
+            throw new SQLException("Not a wrapper of "+iface.getName());
+        }
+    }
+
+    public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+        if (isClosed()) throw new SQLException("Connection has already been closed.");
+        if (CLOSE_VAL==method.getName()) {
+            PooledConnection poolc = this.connection;
+            this.connection = null;
+            pool.returnConnection(poolc);
+            return null;
+        }
+        return method.invoke(connection.getConnection(),args);
+    }
+
+    public boolean isClosed() {
+        return connection==null || connection.isDiscarded();
+    }
+
+    public PooledConnection getDelegateConnection() {
+        return connection;
+    }
+
+    public ConnectionPool getParentPool() {
+        return pool;
+    }
+
+}
index f8a63ec..ab0bd67 100644 (file)
-/* Licensed to the Apache Software Foundation (ASF) under one or more\r
- * contributor license agreements.  See the NOTICE file distributed with\r
- * this work for additional information regarding copyright ownership.\r
- * The ASF licenses this file to You under the Apache License, Version 2.0\r
- * (the "License"); you may not use this file except in compliance with\r
- * the License.  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.apache.tomcat.jdbc.pool.jmx;\r
-/**\r
- * @author Filip Hanik\r
- */\r
-import java.util.Properties;\r
-\r
-import javax.management.DynamicMBean;\r
-\r
-import org.apache.tomcat.jdbc.pool.JdbcInterceptor;\r
-\r
-public class ConnectionPool implements ConnectionPoolMBean  {\r
-    protected org.apache.tomcat.jdbc.pool.ConnectionPool pool = null;\r
-\r
-    public ConnectionPool(org.apache.tomcat.jdbc.pool.ConnectionPool pool) {\r
-        this.pool = pool;\r
-    }\r
-\r
-    public org.apache.tomcat.jdbc.pool.ConnectionPool getPool() {\r
-        return pool;\r
-    }\r
-\r
-    //=================================================================\r
-    //       POOL STATS\r
-    //=================================================================\r
-\r
-    public int getSize() {\r
-        return pool.getSize();\r
-    }\r
-\r
-    public int getIdle() {\r
-        return pool.getIdle();\r
-    }\r
-\r
-    public int getActive() {\r
-        return pool.getActive();\r
-    }\r
-    \r
-    public boolean isPoolSweeperEnabled() {\r
-        return pool.getPoolProperties().isPoolSweeperEnabled();\r
-    }\r
-\r
-    //=================================================================\r
-    //       POOL OPERATIONS\r
-    //=================================================================\r
-    public void checkIdle() {\r
-        pool.checkIdle();\r
-    }\r
-\r
-    public void checkAbandoned() {\r
-        pool.checkAbandoned();\r
-    }\r
-\r
-    public void testIdle() {\r
-        pool.testAllIdle();\r
-    }\r
-    //=================================================================\r
-    //       POOL PROPERTIES\r
-    //=================================================================\r
-    public Properties getDbProperties() {\r
-        return pool.getPoolProperties().getDbProperties();\r
-    }\r
-    public String getUrl() {\r
-        return pool.getPoolProperties().getUrl();\r
-    }\r
-    public String getDriverClassName() {\r
-        return pool.getPoolProperties().getDriverClassName();\r
-    }\r
-    public boolean isDefaultAutoCommit() {\r
-        return pool.getPoolProperties().isDefaultAutoCommit();\r
-    }\r
-    public boolean isDefaultReadOnly() {\r
-        return pool.getPoolProperties().isDefaultReadOnly();\r
-    }\r
-    public int getDefaultTransactionIsolation() {\r
-        return pool.getPoolProperties().getDefaultTransactionIsolation();\r
-    }\r
-    public String getConnectionProperties() {\r
-        return pool.getPoolProperties().getConnectionProperties();\r
-    }\r
-    public String getDefaultCatalog() {\r
-        return pool.getPoolProperties().getDefaultCatalog();\r
-    }\r
-    public int getInitialSize() {\r
-        return pool.getPoolProperties().getInitialSize();\r
-    }\r
-    public int getMaxActive() {\r
-        return pool.getPoolProperties().getMaxActive();\r
-    }\r
-    public int getMaxIdle() {\r
-        return pool.getPoolProperties().getMaxIdle();\r
-    }\r
-    public int getMinIdle() {\r
-        return pool.getPoolProperties().getMinIdle();\r
-    }\r
-    public int getMaxWait() {\r
-        return pool.getPoolProperties().getMaxWait();\r
-    }\r
-    public String getValidationQuery() {\r
-        return pool.getPoolProperties().getValidationQuery();\r
-    }\r
-    public boolean isTestOnBorrow() {\r
-        return pool.getPoolProperties().isTestOnBorrow();\r
-    }\r
-    public boolean isTestOnReturn() {\r
-        return pool.getPoolProperties().isTestOnReturn();\r
-    }\r
-    public boolean isTestWhileIdle() {\r
-        return pool.getPoolProperties().isTestWhileIdle();\r
-    }\r
-    public int getTimeBetweenEvictionRunsMillis() {\r
-        return pool.getPoolProperties().getTimeBetweenEvictionRunsMillis();\r
-    }\r
-    public int getNumTestsPerEvictionRun() {\r
-        return pool.getPoolProperties().getNumTestsPerEvictionRun();\r
-    }\r
-    public int getMinEvictableIdleTimeMillis() {\r
-        return pool.getPoolProperties().getMinEvictableIdleTimeMillis();\r
-    }\r
-    public boolean isAccessToUnderlyingConnectionAllowed() {\r
-        return pool.getPoolProperties().isAccessToUnderlyingConnectionAllowed();\r
-    }\r
-    public boolean isRemoveAbandoned() {\r
-        return pool.getPoolProperties().isRemoveAbandoned();\r
-    }\r
-    public int getRemoveAbandonedTimeout() {\r
-        return pool.getPoolProperties().getRemoveAbandonedTimeout();\r
-    }\r
-    public boolean isLogAbandoned() {\r
-        return pool.getPoolProperties().isLogAbandoned();\r
-    }\r
-    public int getLoginTimeout() {\r
-        return pool.getPoolProperties().getLoginTimeout();\r
-    }\r
-    public String getName() {\r
-        return pool.getPoolProperties().getName();\r
-    }\r
-    public String getPassword() {\r
-        return pool.getPoolProperties().getPassword();\r
-    }\r
-    public String getUsername() {\r
-        return pool.getPoolProperties().getUsername();\r
-    }\r
-    public long getValidationInterval() {\r
-        return pool.getPoolProperties().getValidationInterval();\r
-    }\r
-    public String getInitSQL() {\r
-        return pool.getPoolProperties().getInitSQL();\r
-    }\r
-    public boolean isTestOnConnect() {\r
-        return pool.getPoolProperties().isTestOnConnect();\r
-    }\r
-    public String getJdbcInterceptors() {\r
-        return pool.getPoolProperties().getJdbcInterceptors();\r
-    }\r
-\r
-}\r
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.pool.jmx;
+/**
+ * @author Filip Hanik
+ */
+import java.util.Properties;
+
+import javax.management.DynamicMBean;
+
+import org.apache.tomcat.jdbc.pool.JdbcInterceptor;
+
+public class ConnectionPool implements ConnectionPoolMBean  {
+    protected org.apache.tomcat.jdbc.pool.ConnectionPool pool = null;
+
+    public ConnectionPool(org.apache.tomcat.jdbc.pool.ConnectionPool pool) {
+        this.pool = pool;
+    }
+
+    public org.apache.tomcat.jdbc.pool.ConnectionPool getPool() {
+        return pool;
+    }
+
+    //=================================================================
+    //       POOL STATS
+    //=================================================================
+
+    public int getSize() {
+        return pool.getSize();
+    }
+
+    public int getIdle() {
+        return pool.getIdle();
+    }
+
+    public int getActive() {
+        return pool.getActive();
+    }
+    
+    public boolean isPoolSweeperEnabled() {
+        return pool.getPoolProperties().isPoolSweeperEnabled();
+    }
+
+    //=================================================================
+    //       POOL OPERATIONS
+    //=================================================================
+    public void checkIdle() {
+        pool.checkIdle();
+    }
+
+    public void checkAbandoned() {
+        pool.checkAbandoned();
+    }
+
+    public void testIdle() {
+        pool.testAllIdle();
+    }
+    //=================================================================
+    //       POOL PROPERTIES
+    //=================================================================
+    public Properties getDbProperties() {
+        return pool.getPoolProperties().getDbProperties();
+    }
+    public String getUrl() {
+        return pool.getPoolProperties().getUrl();
+    }
+    public String getDriverClassName() {
+        return pool.getPoolProperties().getDriverClassName();
+    }
+    public boolean isDefaultAutoCommit() {
+        return pool.getPoolProperties().isDefaultAutoCommit();
+    }
+    public boolean isDefaultReadOnly() {
+        return pool.getPoolProperties().isDefaultReadOnly();
+    }
+    public int getDefaultTransactionIsolation() {
+        return pool.getPoolProperties().getDefaultTransactionIsolation();
+    }
+    public String getConnectionProperties() {
+        return pool.getPoolProperties().getConnectionProperties();
+    }
+    public String getDefaultCatalog() {
+        return pool.getPoolProperties().getDefaultCatalog();
+    }
+    public int getInitialSize() {
+        return pool.getPoolProperties().getInitialSize();
+    }
+    public int getMaxActive() {
+        return pool.getPoolProperties().getMaxActive();
+    }
+    public int getMaxIdle() {
+        return pool.getPoolProperties().getMaxIdle();
+    }
+    public int getMinIdle() {
+        return pool.getPoolProperties().getMinIdle();
+    }
+    public int getMaxWait() {
+        return pool.getPoolProperties().getMaxWait();
+    }
+    public String getValidationQuery() {
+        return pool.getPoolProperties().getValidationQuery();
+    }
+    public boolean isTestOnBorrow() {
+        return pool.getPoolProperties().isTestOnBorrow();
+    }
+    public boolean isTestOnReturn() {
+        return pool.getPoolProperties().isTestOnReturn();
+    }
+    public boolean isTestWhileIdle() {
+        return pool.getPoolProperties().isTestWhileIdle();
+    }
+    public int getTimeBetweenEvictionRunsMillis() {
+        return pool.getPoolProperties().getTimeBetweenEvictionRunsMillis();
+    }
+    public int getNumTestsPerEvictionRun() {
+        return pool.getPoolProperties().getNumTestsPerEvictionRun();
+    }
+    public int getMinEvictableIdleTimeMillis() {
+        return pool.getPoolProperties().getMinEvictableIdleTimeMillis();
+    }
+    public boolean isAccessToUnderlyingConnectionAllowed() {
+        return pool.getPoolProperties().isAccessToUnderlyingConnectionAllowed();
+    }
+    public boolean isRemoveAbandoned() {
+        return pool.getPoolProperties().isRemoveAbandoned();
+    }
+    public int getRemoveAbandonedTimeout() {
+        return pool.getPoolProperties().getRemoveAbandonedTimeout();
+    }
+    public boolean isLogAbandoned() {
+        return pool.getPoolProperties().isLogAbandoned();
+    }
+    public int getLoginTimeout() {
+        return pool.getPoolProperties().getLoginTimeout();
+    }
+    public String getName() {
+        return pool.getPoolProperties().getName();
+    }
+    public String getPassword() {
+        return pool.getPoolProperties().getPassword();
+    }
+    public String getUsername() {
+        return pool.getPoolProperties().getUsername();
+    }
+    public long getValidationInterval() {
+        return pool.getPoolProperties().getValidationInterval();
+    }
+    public String getInitSQL() {
+        return pool.getPoolProperties().getInitSQL();
+    }
+    public boolean isTestOnConnect() {
+        return pool.getPoolProperties().isTestOnConnect();
+    }
+    public String getJdbcInterceptors() {
+        return pool.getPoolProperties().getJdbcInterceptors();
+    }
+
+}
index 053fc2d..2d60142 100644 (file)
-/* Licensed to the Apache Software Foundation (ASF) under one or more\r
- * contributor license agreements.  See the NOTICE file distributed with\r
- * this work for additional information regarding copyright ownership.\r
- * The ASF licenses this file to You under the Apache License, Version 2.0\r
- * (the "License"); you may not use this file except in compliance with\r
- * the License.  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.apache.tomcat.jdbc.pool.jmx;\r
-\r
-import java.util.Properties;\r
-\r
-import javax.management.DynamicMBean;\r
-\r
-import org.apache.tomcat.jdbc.pool.ConnectionPool;\r
-import org.apache.tomcat.jdbc.pool.JdbcInterceptor;\r
-\r
-public interface ConnectionPoolMBean  {\r
-\r
-    //=================================================================\r
-    //       POOL STATS\r
-    //=================================================================\r
-\r
-    public int getSize();\r
-\r
-    public int getIdle();\r
-\r
-    public int getActive();\r
-    \r
-    public boolean isPoolSweeperEnabled();\r
-\r
-    //=================================================================\r
-    //       POOL OPERATIONS\r
-    //=================================================================\r
-    public void checkIdle();\r
-\r
-    public void checkAbandoned();\r
-\r
-    public void testIdle();\r
-\r
-    //=================================================================\r
-    //       POOL PROPERTIES\r
-    //=================================================================\r
-    public Properties getDbProperties();\r
-\r
-    public String getUrl();\r
-\r
-    public String getDriverClassName();\r
-\r
-    public boolean isDefaultAutoCommit();\r
-\r
-    public boolean isDefaultReadOnly();\r
-\r
-    public int getDefaultTransactionIsolation();\r
-\r
-    public String getConnectionProperties();\r
-\r
-    public String getDefaultCatalog();\r
-\r
-    public int getInitialSize();\r
-\r
-    public int getMaxActive();\r
-\r
-    public int getMaxIdle();\r
-\r
-    public int getMinIdle();\r
-\r
-    public int getMaxWait();\r
-\r
-    public String getValidationQuery();\r
-\r
-    public boolean isTestOnBorrow();\r
-\r
-    public boolean isTestOnReturn();\r
-\r
-    public boolean isTestWhileIdle();\r
-\r
-    public int getTimeBetweenEvictionRunsMillis();\r
-\r
-    public int getNumTestsPerEvictionRun();\r
-\r
-    public int getMinEvictableIdleTimeMillis();\r
-\r
-    public boolean isAccessToUnderlyingConnectionAllowed();\r
-\r
-    public boolean isRemoveAbandoned();\r
-\r
-    public int getRemoveAbandonedTimeout();\r
-\r
-    public boolean isLogAbandoned();\r
-\r
-    public int getLoginTimeout();\r
-\r
-    public String getName();\r
-\r
-    public String getPassword();\r
-\r
-    public String getUsername();\r
-\r
-    public long getValidationInterval();\r
-\r
-    public String getInitSQL();\r
-\r
-    public boolean isTestOnConnect();\r
-\r
-    public String getJdbcInterceptors();\r
-\r
-}\r
+/* Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.pool.jmx;
+
+import java.util.Properties;
+
+import javax.management.DynamicMBean;
+
+import org.apache.tomcat.jdbc.pool.ConnectionPool;
+import org.apache.tomcat.jdbc.pool.JdbcInterceptor;
+
+public interface ConnectionPoolMBean  {
+
+    //=================================================================
+    //       POOL STATS
+    //=================================================================
+
+    public int getSize();
+
+    public int getIdle();
+
+    public int getActive();
+    
+    public boolean isPoolSweeperEnabled();
+
+    //=================================================================
+    //       POOL OPERATIONS
+    //=================================================================
+    public void checkIdle();
+
+    public void checkAbandoned();
+
+    public void testIdle();
+
+    //=================================================================
+    //       POOL PROPERTIES
+    //=================================================================
+    public Properties getDbProperties();
+
+    public String getUrl();
+
+    public String getDriverClassName();
+
+    public boolean isDefaultAutoCommit();
+
+    public boolean isDefaultReadOnly();
+
+    public int getDefaultTransactionIsolation();
+
+    public String getConnectionProperties();
+
+    public String getDefaultCatalog();
+
+    public int getInitialSize();
+
+    public int getMaxActive();
+
+    public int getMaxIdle();
+
+    public int getMinIdle();
+
+    public int getMaxWait();
+
+    public String getValidationQuery();
+
+    public boolean isTestOnBorrow();
+
+    public boolean isTestOnReturn();
+
+    public boolean isTestWhileIdle();
+
+    public int getTimeBetweenEvictionRunsMillis();
+
+    public int getNumTestsPerEvictionRun();
+
+    public int getMinEvictableIdleTimeMillis();
+
+    public boolean isAccessToUnderlyingConnectionAllowed();
+
+    public boolean isRemoveAbandoned();
+
+    public int getRemoveAbandonedTimeout();
+
+    public boolean isLogAbandoned();
+
+    public int getLoginTimeout();
+
+    public String getName();
+
+    public String getPassword();
+
+    public String getUsername();
+
+    public long getValidationInterval();
+
+    public String getInitSQL();
+
+    public boolean isTestOnConnect();
+
+    public String getJdbcInterceptors();
+
+}
index a800f0f..93ab3e9 100644 (file)
-/*\r
- * Licensed to the Apache Software Foundation (ASF) under one or more\r
- * contributor license agreements.  See the NOTICE file distributed with\r
- * this work for additional information regarding copyright ownership.\r
- * The ASF licenses this file to You under the Apache License, Version 2.0\r
- * (the "License"); you may not use this file except in compliance with\r
- * the License.  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.apache.tomcat.jdbc.test;\r
-\r
-import java.util.concurrent.CountDownLatch;\r
-import java.util.concurrent.atomic.AtomicInteger;\r
-import java.sql.Connection;\r
-import java.sql.Statement;\r
-import java.sql.ResultSet;\r
-\r
-import javax.sql.DataSource;\r
-\r
-import org.apache.tomcat.jdbc.pool.DataSourceFactory;\r
-\r
-/**\r
- * @author Filip Hanik\r
- * @version 1.0\r
- */\r
-public class CheckOutThreadTest extends DefaultTestCase {\r
-    public CheckOutThreadTest(String name) {\r
-        super(name);\r
-    }\r
-\r
-    CountDownLatch latch = null;\r
-\r
-    public void testDBCPThreads10Connections10() throws Exception {\r
-        init();\r
-        this.datasource.getPoolProperties().setMaxActive(10);\r
-        this.threadcount = 10;\r
-        this.transferProperties();\r
-        this.tDatasource.getConnection().close();\r
-        latch = new CountDownLatch(threadcount);\r
-        long start = System.currentTimeMillis();\r
-        for (int i=0; i<threadcount; i++) {\r
-            TestThread t = new TestThread();\r
-            t.setName("tomcat-dbcp-"+i);\r
-            t.d = this.tDatasource;\r
-            t.start();\r
-        }\r
-        latch.await();\r
-        long delta = System.currentTimeMillis() - start;\r
-        System.out.println("[testDBCPThreads10Connections10]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));\r
-        tearDown();\r
-    }\r
-\r
-    public void testPoolThreads10Connections10() throws Exception {\r
-        init();\r
-        this.datasource.getPoolProperties().setMaxActive(10);\r
-        this.threadcount = 10;\r
-        this.transferProperties();\r
-        this.datasource.getConnection().close();\r
-        latch = new CountDownLatch(threadcount);\r
-        long start = System.currentTimeMillis();\r
-        for (int i=0; i<threadcount; i++) {\r
-            TestThread t = new TestThread();\r
-            t.setName("tomcat-pool-"+i);\r
-            t.d = DataSourceFactory.getDataSource(this.datasource);\r
-            t.start();\r
-        }\r
-        latch.await();\r
-        long delta = System.currentTimeMillis() - start;\r
-        System.out.println("[testPoolThreads10Connections10]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));\r
-        tearDown();\r
-    }\r
-\r
-    public void testDBCPThreads20Connections10() throws Exception {\r
-        init();\r
-        this.datasource.getPoolProperties().setMaxActive(10);\r
-        this.threadcount = 20;\r
-        this.transferProperties();\r
-        this.tDatasource.getConnection().close();\r
-        latch = new CountDownLatch(threadcount);\r
-        long start = System.currentTimeMillis();\r
-        for (int i=0; i<threadcount; i++) {\r
-            TestThread t = new TestThread();\r
-            t.setName("tomcat-dbcp-"+i);\r
-            t.d = this.tDatasource;\r
-            t.start();\r
-        }\r
-        latch.await();\r
-        long delta = System.currentTimeMillis() - start;\r
-        System.out.println("[testDBCPThreads20Connections10]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));\r
-        tearDown();\r
-    }\r
-\r
-    public void testPoolThreads20Connections10() throws Exception {\r
-        init();\r
-        this.datasource.getPoolProperties().setMaxActive(10);\r
-        this.threadcount = 20;\r
-        this.transferProperties();\r
-        this.datasource.getConnection().close();\r
-        latch = new CountDownLatch(threadcount);\r
-        long start = System.currentTimeMillis();\r
-        for (int i=0; i<threadcount; i++) {\r
-            TestThread t = new TestThread();\r
-            t.setName("tomcat-pool-"+i);\r
-            t.d = DataSourceFactory.getDataSource(this.datasource);\r
-            t.start();\r
-        }\r
-        latch.await();\r
-        long delta = System.currentTimeMillis() - start;\r
-        System.out.println("[testPoolThreads20Connections10]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));\r
-        tearDown();\r
-    }\r
-\r
-    public void testPoolThreads20Connections10Fair() throws Exception {\r
-        init();\r
-        this.datasource.getPoolProperties().setMaxActive(10);\r
-        this.datasource.getPoolProperties().setFairQueue(true);\r
-        this.threadcount = 20;\r
-        this.transferProperties();\r
-        this.datasource.getConnection().close();\r
-        latch = new CountDownLatch(threadcount);\r
-        long start = System.currentTimeMillis();\r
-        for (int i=0; i<threadcount; i++) {\r
-            TestThread t = new TestThread();\r
-            t.setName("tomcat-pool-"+i);\r
-            t.d = DataSourceFactory.getDataSource(this.datasource);\r
-            t.start();\r
-        }\r
-        latch.await();\r
-        long delta = System.currentTimeMillis() - start;\r
-        System.out.println("[testPoolThreads20Connections10Fair]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));\r
-        tearDown();\r
-    }\r
-\r
-    \r
-    public void testDBCPThreads10Connections10Validate() throws Exception {\r
-        init();\r
-        this.datasource.getPoolProperties().setMaxActive(10);\r
-        this.datasource.getPoolProperties().setValidationQuery("SELECT 1");\r
-        this.datasource.getPoolProperties().setTestOnBorrow(true);\r
-        this.threadcount = 10;\r
-        this.transferProperties();\r
-        this.tDatasource.getConnection().close();\r
-        latch = new CountDownLatch(threadcount);\r
-        long start = System.currentTimeMillis();\r
-        for (int i=0; i<threadcount; i++) {\r
-            TestThread t = new TestThread();\r
-            t.setName("tomcat-dbcp-validate-"+i);\r
-            t.d = this.tDatasource;\r
-            t.start();\r
-        }\r
-        latch.await();\r
-        long delta = System.currentTimeMillis() - start;\r
-        System.out.println("[testDBCPThreads10Connections10Validate]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));\r
-        tearDown();\r
-    }\r
-\r
-    public void testPoolThreads10Connections10Validate() throws Exception {\r
-        init();\r
-        this.datasource.getPoolProperties().setMaxActive(10);\r
-        this.datasource.getPoolProperties().setValidationQuery("SELECT 1");\r
-        this.datasource.getPoolProperties().setTestOnBorrow(true);\r
-        this.threadcount = 10;\r
-        this.transferProperties();\r
-        this.datasource.getConnection().close();\r
-        latch = new CountDownLatch(threadcount);\r
-        long start = System.currentTimeMillis();\r
-        for (int i=0; i<threadcount; i++) {\r
-            TestThread t = new TestThread();\r
-            t.setName("tomcat-pool-validate-"+i);\r
-            t.d = DataSourceFactory.getDataSource(this.datasource);\r
-            t.start();\r
-        }\r
-        latch.await();\r
-        long delta = System.currentTimeMillis() - start;\r
-        System.out.println("[testPoolThreads10Connections10Validate]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));\r
-        tearDown();\r
-    }\r
-\r
-    public void testDBCPThreads20Connections10Validate() throws Exception {\r
-        init();\r
-        this.datasource.getPoolProperties().setMaxActive(10);\r
-        this.datasource.getPoolProperties().setValidationQuery("SELECT 1");\r
-        this.datasource.getPoolProperties().setTestOnBorrow(true);\r
-        this.threadcount = 20;\r
-        this.transferProperties();\r
-        this.tDatasource.getConnection().close();\r
-        latch = new CountDownLatch(threadcount);\r
-        long start = System.currentTimeMillis();\r
-        for (int i=0; i<threadcount; i++) {\r
-            TestThread t = new TestThread();\r
-            t.setName("tomcat-dbcp-validate-"+i);\r
-            t.d = this.tDatasource;\r
-            t.start();\r
-        }\r
-        latch.await();\r
-        long delta = System.currentTimeMillis() - start;\r
-        System.out.println("[testDBCPThreads20Connections10Validate]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));\r
-        tearDown();\r
-    }\r
-\r
-    public void testPoolThreads10Connections20Validate() throws Exception {\r
-        init();\r
-        this.datasource.getPoolProperties().setMaxActive(10);\r
-        this.datasource.getPoolProperties().setValidationQuery("SELECT 1");\r
-        this.datasource.getPoolProperties().setTestOnBorrow(true);\r
-        this.threadcount = 20;\r
-        this.transferProperties();\r
-        this.datasource.getConnection().close();\r
-        latch = new CountDownLatch(threadcount);\r
-        long start = System.currentTimeMillis();\r
-        for (int i=0; i<threadcount; i++) {\r
-            TestThread t = new TestThread();\r
-            t.setName("tomcat-pool-validate-"+i);\r
-            t.d = DataSourceFactory.getDataSource(this.datasource);\r
-            t.start();\r
-        }\r
-        latch.await();\r
-        long delta = System.currentTimeMillis() - start;\r
-        System.out.println("[testPoolThreads20Connections10Validate]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));\r
-        tearDown();\r
-    }\r
-    \r
-    public void testDBCPThreads10Connections10WithQuery() throws Exception {\r
-        init();\r
-        this.datasource.getPoolProperties().setMaxActive(10);\r
-        this.datasource.getPoolProperties().setTestOnBorrow(false);\r
-        this.threadcount = 10;\r
-        this.transferProperties();\r
-        this.tDatasource.getConnection().close();\r
-        latch = new CountDownLatch(threadcount);\r
-        long start = System.currentTimeMillis();\r
-        for (int i=0; i<threadcount; i++) {\r
-            TestThread t = new TestThread();\r
-            t.setName("tomcat-dbcp-"+i);\r
-            t.d = this.tDatasource;\r
-            t.query = "select * from user";\r
-            t.start();\r
-        }\r
-        latch.await();\r
-        long delta = System.currentTimeMillis() - start;\r
-        System.out.println("[testDBCPThreads10Connections10WithQuery]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));\r
-        tearDown();\r
-    }\r
-\r
-    public void testPoolThreads10Connections10WithQuery() throws Exception {\r
-        init();\r
-        this.datasource.getPoolProperties().setMaxActive(10);\r
-        this.datasource.getPoolProperties().setTestOnBorrow(false);\r
-        this.threadcount = 10;\r
-        this.transferProperties();\r
-        this.datasource.getConnection().close();\r
-        latch = new CountDownLatch(threadcount);\r
-        long start = System.currentTimeMillis();\r
-        for (int i=0; i<threadcount; i++) {\r
-            TestThread t = new TestThread();\r
-            t.setName("tomcat-pool-"+i);\r
-            t.d = DataSourceFactory.getDataSource(this.datasource);\r
-            t.query = "select * from user";\r
-            t.start();\r
-        }\r
-        latch.await();\r
-        long delta = System.currentTimeMillis() - start;\r
-        System.out.println("[testPoolThreads10Connections10WithQuery]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));\r
-        tearDown();\r
-    }\r
-    \r
-    public void testDBCPThreads10Connections10WithValidateWithQuery() throws Exception {\r
-        init();\r
-        this.datasource.getPoolProperties().setMaxActive(10);\r
-        this.datasource.getPoolProperties().setTestOnBorrow(true);\r
-        this.datasource.getPoolProperties().setValidationQuery("SELECT 1");\r
-        this.threadcount = 10;\r
-        this.transferProperties();\r
-        this.tDatasource.getConnection().close();\r
-        latch = new CountDownLatch(threadcount);\r
-        long start = System.currentTimeMillis();\r
-        for (int i=0; i<threadcount; i++) {\r
-            TestThread t = new TestThread();\r
-            t.setName("tomcat-dbcp-"+i);\r
-            t.d = this.tDatasource;\r
-            t.query = "select * from user";\r
-            t.start();\r
-        }\r
-        latch.await();\r
-        long delta = System.currentTimeMillis() - start;\r
-        System.out.println("[testDBCPThreads10Connections10WithValidateWithQuery]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));\r
-        tearDown();\r
-    }\r
-\r
-    public void testPoolThreads10Connections10WithValidateWithQuery() throws Exception {\r
-        init();\r
-        this.datasource.getPoolProperties().setMaxActive(10);\r
-        this.datasource.getPoolProperties().setTestOnBorrow(true);\r
-        this.datasource.getPoolProperties().setValidationQuery("SELECT 1");\r
-        this.threadcount = 10;\r
-        this.transferProperties();\r
-        this.datasource.getConnection().close();\r
-        latch = new CountDownLatch(threadcount);\r
-        long start = System.currentTimeMillis();\r
-        for (int i=0; i<threadcount; i++) {\r
-            TestThread t = new TestThread();\r
-            t.setName("tomcat-pool-"+i);\r
-            t.d = DataSourceFactory.getDataSource(this.datasource);\r
-            t.query = "select * from user";\r
-            t.start();\r
-        }\r
-        latch.await();\r
-        long delta = System.currentTimeMillis() - start;\r
-        System.out.println("[testPoolThreads10Connections10WithValidateWithQuery]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));\r
-        tearDown();\r
-    }\r
-    \r
-    public class TestThread extends Thread {\r
-        protected DataSource d;\r
-        protected String query = null;\r
-        public void run() {\r
-            long max = -1, totalmax=0, totalcmax=0, cmax = -1, nroffetch = 0, totalruntime = 0;\r
-            try {\r
-                for (int i = 0; i < CheckOutThreadTest.this.iterations; i++) {\r
-                    long start = System.nanoTime();\r
-                    Connection con = null;\r
-                    try {\r
-                        con = d.getConnection();\r
-                        long delta = System.nanoTime() - start;\r
-                        totalmax += delta;\r
-                        max = Math.max(delta, max);\r
-                        nroffetch++;\r
-                        if (query!=null) {\r
-                            Statement st = con.createStatement();\r
-                            ResultSet rs = st.executeQuery(query);\r
-                            while (rs.next()) {\r
-                            }\r
-                            rs.close();\r
-                            st.close();\r
-                        }\r
-                    } finally {\r
-                        long cstart = System.nanoTime();\r
-                        if (con!=null) try {con.close();}catch(Exception x) {x.printStackTrace();}\r
-                        long cdelta = System.nanoTime() - cstart;\r
-                        totalcmax += cdelta;\r
-                        cmax = Math.max(cdelta, cmax);\r
-                    }\r
-                    totalruntime+=(System.nanoTime()-start);\r
-                }\r
-\r
-            } catch (Exception x) {\r
-                x.printStackTrace();\r
-            } finally {\r
-                CheckOutThreadTest.this.latch.countDown();\r
-            }\r
-            if (System.getProperty("print-thread-stats")!=null) {\r
-                System.out.println("["+getName()+"] "+\r
-                    "\n\tMax time to retrieve connection:"+(((float)max)/1000f/1000f)+" ms."+\r
-                    "\n\tTotal time to retrieve connection:"+(((float)totalmax)/1000f/1000f)+" ms."+\r
-                    "\n\tAverage time to retrieve connection:"+(((float)totalmax)/1000f/1000f)/(float)nroffetch+" ms."+\r
-                    "\n\tMax time to close connection:"+(((float)cmax)/1000f/1000f)+" ms."+\r
-                    "\n\tTotal time to close connection:"+(((float)totalcmax)/1000f/1000f)+" ms."+\r
-                    "\n\tAverage time to close connection:"+(((float)totalcmax)/1000f/1000f)/(float)nroffetch+" ms."+\r
-                    "\n\tRun time:"+(((float)totalruntime)/1000f/1000f)+" ms."+\r
-                    "\n\tNr of fetch:"+nroffetch);\r
-            }\r
-        }\r
-    }\r
-}\r
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.test;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.sql.Connection;
+import java.sql.Statement;
+import java.sql.ResultSet;
+
+import javax.sql.DataSource;
+
+import org.apache.tomcat.jdbc.pool.DataSourceFactory;
+
+/**
+ * @author Filip Hanik
+ * @version 1.0
+ */
+public class CheckOutThreadTest extends DefaultTestCase {
+    public CheckOutThreadTest(String name) {
+        super(name);
+    }
+
+    CountDownLatch latch = null;
+
+    public void testDBCPThreads10Connections10() throws Exception {
+        init();
+        this.datasource.getPoolProperties().setMaxActive(10);
+        this.threadcount = 10;
+        this.transferProperties();
+        this.tDatasource.getConnection().close();
+        latch = new CountDownLatch(threadcount);
+        long start = System.currentTimeMillis();
+        for (int i=0; i<threadcount; i++) {
+            TestThread t = new TestThread();
+            t.setName("tomcat-dbcp-"+i);
+            t.d = this.tDatasource;
+            t.start();
+        }
+        latch.await();
+        long delta = System.currentTimeMillis() - start;
+        System.out.println("[testDBCPThreads10Connections10]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));
+        tearDown();
+    }
+
+    public void testPoolThreads10Connections10() throws Exception {
+        init();
+        this.datasource.getPoolProperties().setMaxActive(10);
+        this.threadcount = 10;
+        this.transferProperties();
+        this.datasource.getConnection().close();
+        latch = new CountDownLatch(threadcount);
+        long start = System.currentTimeMillis();
+        for (int i=0; i<threadcount; i++) {
+            TestThread t = new TestThread();
+            t.setName("tomcat-pool-"+i);
+            t.d = DataSourceFactory.getDataSource(this.datasource);
+            t.start();
+        }
+        latch.await();
+        long delta = System.currentTimeMillis() - start;
+        System.out.println("[testPoolThreads10Connections10]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));
+        tearDown();
+    }
+
+    public void testDBCPThreads20Connections10() throws Exception {
+        init();
+        this.datasource.getPoolProperties().setMaxActive(10);
+        this.threadcount = 20;
+        this.transferProperties();
+        this.tDatasource.getConnection().close();
+        latch = new CountDownLatch(threadcount);
+        long start = System.currentTimeMillis();
+        for (int i=0; i<threadcount; i++) {
+            TestThread t = new TestThread();
+            t.setName("tomcat-dbcp-"+i);
+            t.d = this.tDatasource;
+            t.start();
+        }
+        latch.await();
+        long delta = System.currentTimeMillis() - start;
+        System.out.println("[testDBCPThreads20Connections10]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));
+        tearDown();
+    }
+
+    public void testPoolThreads20Connections10() throws Exception {
+        init();
+        this.datasource.getPoolProperties().setMaxActive(10);
+        this.threadcount = 20;
+        this.transferProperties();
+        this.datasource.getConnection().close();
+        latch = new CountDownLatch(threadcount);
+        long start = System.currentTimeMillis();
+        for (int i=0; i<threadcount; i++) {
+            TestThread t = new TestThread();
+            t.setName("tomcat-pool-"+i);
+            t.d = DataSourceFactory.getDataSource(this.datasource);
+            t.start();
+        }
+        latch.await();
+        long delta = System.currentTimeMillis() - start;
+        System.out.println("[testPoolThreads20Connections10]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));
+        tearDown();
+    }
+
+    public void testPoolThreads20Connections10Fair() throws Exception {
+        init();
+        this.datasource.getPoolProperties().setMaxActive(10);
+        this.datasource.getPoolProperties().setFairQueue(true);
+        this.threadcount = 20;
+        this.transferProperties();
+        this.datasource.getConnection().close();
+        latch = new CountDownLatch(threadcount);
+        long start = System.currentTimeMillis();
+        for (int i=0; i<threadcount; i++) {
+            TestThread t = new TestThread();
+            t.setName("tomcat-pool-"+i);
+            t.d = DataSourceFactory.getDataSource(this.datasource);
+            t.start();
+        }
+        latch.await();
+        long delta = System.currentTimeMillis() - start;
+        System.out.println("[testPoolThreads20Connections10Fair]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));
+        tearDown();
+    }
+
+    
+    public void testDBCPThreads10Connections10Validate() throws Exception {
+        init();
+        this.datasource.getPoolProperties().setMaxActive(10);
+        this.datasource.getPoolProperties().setValidationQuery("SELECT 1");
+        this.datasource.getPoolProperties().setTestOnBorrow(true);
+        this.threadcount = 10;
+        this.transferProperties();
+        this.tDatasource.getConnection().close();
+        latch = new CountDownLatch(threadcount);
+        long start = System.currentTimeMillis();
+        for (int i=0; i<threadcount; i++) {
+            TestThread t = new TestThread();
+            t.setName("tomcat-dbcp-validate-"+i);
+            t.d = this.tDatasource;
+            t.start();
+        }
+        latch.await();
+        long delta = System.currentTimeMillis() - start;
+        System.out.println("[testDBCPThreads10Connections10Validate]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));
+        tearDown();
+    }
+
+    public void testPoolThreads10Connections10Validate() throws Exception {
+        init();
+        this.datasource.getPoolProperties().setMaxActive(10);
+        this.datasource.getPoolProperties().setValidationQuery("SELECT 1");
+        this.datasource.getPoolProperties().setTestOnBorrow(true);
+        this.threadcount = 10;
+        this.transferProperties();
+        this.datasource.getConnection().close();
+        latch = new CountDownLatch(threadcount);
+        long start = System.currentTimeMillis();
+        for (int i=0; i<threadcount; i++) {
+            TestThread t = new TestThread();
+            t.setName("tomcat-pool-validate-"+i);
+            t.d = DataSourceFactory.getDataSource(this.datasource);
+            t.start();
+        }
+        latch.await();
+        long delta = System.currentTimeMillis() - start;
+        System.out.println("[testPoolThreads10Connections10Validate]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));
+        tearDown();
+    }
+
+    public void testDBCPThreads20Connections10Validate() throws Exception {
+        init();
+        this.datasource.getPoolProperties().setMaxActive(10);
+        this.datasource.getPoolProperties().setValidationQuery("SELECT 1");
+        this.datasource.getPoolProperties().setTestOnBorrow(true);
+        this.threadcount = 20;
+        this.transferProperties();
+        this.tDatasource.getConnection().close();
+        latch = new CountDownLatch(threadcount);
+        long start = System.currentTimeMillis();
+        for (int i=0; i<threadcount; i++) {
+            TestThread t = new TestThread();
+            t.setName("tomcat-dbcp-validate-"+i);
+            t.d = this.tDatasource;
+            t.start();
+        }
+        latch.await();
+        long delta = System.currentTimeMillis() - start;
+        System.out.println("[testDBCPThreads20Connections10Validate]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));
+        tearDown();
+    }
+
+    public void testPoolThreads10Connections20Validate() throws Exception {
+        init();
+        this.datasource.getPoolProperties().setMaxActive(10);
+        this.datasource.getPoolProperties().setValidationQuery("SELECT 1");
+        this.datasource.getPoolProperties().setTestOnBorrow(true);
+        this.threadcount = 20;
+        this.transferProperties();
+        this.datasource.getConnection().close();
+        latch = new CountDownLatch(threadcount);
+        long start = System.currentTimeMillis();
+        for (int i=0; i<threadcount; i++) {
+            TestThread t = new TestThread();
+            t.setName("tomcat-pool-validate-"+i);
+            t.d = DataSourceFactory.getDataSource(this.datasource);
+            t.start();
+        }
+        latch.await();
+        long delta = System.currentTimeMillis() - start;
+        System.out.println("[testPoolThreads20Connections10Validate]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));
+        tearDown();
+    }
+    
+    public void testDBCPThreads10Connections10WithQuery() throws Exception {
+        init();
+        this.datasource.getPoolProperties().setMaxActive(10);
+        this.datasource.getPoolProperties().setTestOnBorrow(false);
+        this.threadcount = 10;
+        this.transferProperties();
+        this.tDatasource.getConnection().close();
+        latch = new CountDownLatch(threadcount);
+        long start = System.currentTimeMillis();
+        for (int i=0; i<threadcount; i++) {
+            TestThread t = new TestThread();
+            t.setName("tomcat-dbcp-"+i);
+            t.d = this.tDatasource;
+            t.query = "select * from user";
+            t.start();
+        }
+        latch.await();
+        long delta = System.currentTimeMillis() - start;
+        System.out.println("[testDBCPThreads10Connections10WithQuery]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));
+        tearDown();
+    }
+
+    public void testPoolThreads10Connections10WithQuery() throws Exception {
+        init();
+        this.datasource.getPoolProperties().setMaxActive(10);
+        this.datasource.getPoolProperties().setTestOnBorrow(false);
+        this.threadcount = 10;
+        this.transferProperties();
+        this.datasource.getConnection().close();
+        latch = new CountDownLatch(threadcount);
+        long start = System.currentTimeMillis();
+        for (int i=0; i<threadcount; i++) {
+            TestThread t = new TestThread();
+            t.setName("tomcat-pool-"+i);
+            t.d = DataSourceFactory.getDataSource(this.datasource);
+            t.query = "select * from user";
+            t.start();
+        }
+        latch.await();
+        long delta = System.currentTimeMillis() - start;
+        System.out.println("[testPoolThreads10Connections10WithQuery]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));
+        tearDown();
+    }
+    
+    public void testDBCPThreads10Connections10WithValidateWithQuery() throws Exception {
+        init();
+        this.datasource.getPoolProperties().setMaxActive(10);
+        this.datasource.getPoolProperties().setTestOnBorrow(true);
+        this.datasource.getPoolProperties().setValidationQuery("SELECT 1");
+        this.threadcount = 10;
+        this.transferProperties();
+        this.tDatasource.getConnection().close();
+        latch = new CountDownLatch(threadcount);
+        long start = System.currentTimeMillis();
+        for (int i=0; i<threadcount; i++) {
+            TestThread t = new TestThread();
+            t.setName("tomcat-dbcp-"+i);
+            t.d = this.tDatasource;
+            t.query = "select * from user";
+            t.start();
+        }
+        latch.await();
+        long delta = System.currentTimeMillis() - start;
+        System.out.println("[testDBCPThreads10Connections10WithValidateWithQuery]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));
+        tearDown();
+    }
+
+    public void testPoolThreads10Connections10WithValidateWithQuery() throws Exception {
+        init();
+        this.datasource.getPoolProperties().setMaxActive(10);
+        this.datasource.getPoolProperties().setTestOnBorrow(true);
+        this.datasource.getPoolProperties().setValidationQuery("SELECT 1");
+        this.threadcount = 10;
+        this.transferProperties();
+        this.datasource.getConnection().close();
+        latch = new CountDownLatch(threadcount);
+        long start = System.currentTimeMillis();
+        for (int i=0; i<threadcount; i++) {
+            TestThread t = new TestThread();
+            t.setName("tomcat-pool-"+i);
+            t.d = DataSourceFactory.getDataSource(this.datasource);
+            t.query = "select * from user";
+            t.start();
+        }
+        latch.await();
+        long delta = System.currentTimeMillis() - start;
+        System.out.println("[testPoolThreads10Connections10WithValidateWithQuery]Test complete:"+delta+" ms. Iterations:"+(threadcount*this.iterations));
+        tearDown();
+    }
+    
+    public class TestThread extends Thread {
+        protected DataSource d;
+        protected String query = null;
+        public void run() {
+            long max = -1, totalmax=0, totalcmax=0, cmax = -1, nroffetch = 0, totalruntime = 0;
+            try {
+                for (int i = 0; i < CheckOutThreadTest.this.iterations; i++) {
+                    long start = System.nanoTime();
+                    Connection con = null;
+                    try {
+                        con = d.getConnection();
+                        long delta = System.nanoTime() - start;
+                        totalmax += delta;
+                        max = Math.max(delta, max);
+                        nroffetch++;
+                        if (query!=null) {
+                            Statement st = con.createStatement();
+                            ResultSet rs = st.executeQuery(query);
+                            while (rs.next()) {
+                            }
+                            rs.close();
+                            st.close();
+                        }
+                    } finally {
+                        long cstart = System.nanoTime();
+                        if (con!=null) try {con.close();}catch(Exception x) {x.printStackTrace();}
+                        long cdelta = System.nanoTime() - cstart;
+                        totalcmax += cdelta;
+                        cmax = Math.max(cdelta, cmax);
+                    }
+                    totalruntime+=(System.nanoTime()-start);
+                }
+
+            } catch (Exception x) {
+                x.printStackTrace();
+            } finally {
+                CheckOutThreadTest.this.latch.countDown();
+            }
+            if (System.getProperty("print-thread-stats")!=null) {
+                System.out.println("["+getName()+"] "+
+                    "\n\tMax time to retrieve connection:"+(((float)max)/1000f/1000f)+" ms."+
+                    "\n\tTotal time to retrieve connection:"+(((float)totalmax)/1000f/1000f)+" ms."+
+                    "\n\tAverage time to retrieve connection:"+(((float)totalmax)/1000f/1000f)/(float)nroffetch+" ms."+
+                    "\n\tMax time to close connection:"+(((float)cmax)/1000f/1000f)+" ms."+
+                    "\n\tTotal time to close connection:"+(((float)totalcmax)/1000f/1000f)+" ms."+
+                    "\n\tAverage time to close connection:"+(((float)totalcmax)/1000f/1000f)/(float)nroffetch+" ms."+
+                    "\n\tRun time:"+(((float)totalruntime)/1000f/1000f)+" ms."+
+                    "\n\tNr of fetch:"+nroffetch);
+            }
+        }
+    }
+}
index 692ab40..51399a3 100644 (file)
@@ -1,63 +1,63 @@
-/*\r
- * Licensed to the Apache Software Foundation (ASF) under one or more\r
- * contributor license agreements.  See the NOTICE file distributed with\r
- * this work for additional information regarding copyright ownership.\r
- * The ASF licenses this file to You under the Apache License, Version 2.0\r
- * (the "License"); you may not use this file except in compliance with\r
- * the License.  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.apache.tomcat.jdbc.test;\r
-\r
-import java.util.Properties;\r
-\r
-import org.apache.tomcat.jdbc.pool.DataSourceFactory;\r
-import org.apache.tomcat.jdbc.pool.PoolProperties;\r
-\r
-/**\r
- * @author Filip Hanik\r
- * @version 1.0\r
- */\r
-public class DefaultProperties extends PoolProperties {\r
-    public DefaultProperties() {\r
-        dbProperties = new Properties();\r
-        url = "jdbc:mysql://localhost:3306/mysql?autoReconnect=true";\r
-        driverClassName = "com.mysql.jdbc.Driver";\r
-        password = "password";\r
-        username = "root";\r
-        defaultAutoCommit = true;\r
-        defaultReadOnly = false;\r
-        defaultTransactionIsolation = DataSourceFactory.UNKNOWN_TRANSACTIONISOLATION;\r
-        connectionProperties = null;\r
-        defaultCatalog = null;\r
-        initialSize = 10;\r
-        maxActive = 100;\r
-        maxIdle = initialSize;\r
-        minIdle = initialSize;\r
-        maxWait = 10000;\r
-        validationQuery = "SELECT 1";\r
-        testOnBorrow = true;\r
-        testOnReturn = false;\r
-        testWhileIdle = true;\r
-        timeBetweenEvictionRunsMillis = 5000;\r
-        numTestsPerEvictionRun = 0;\r
-        minEvictableIdleTimeMillis = 1000;\r
-        accessToUnderlyingConnectionAllowed = false;\r
-        removeAbandoned = true;\r
-        removeAbandonedTimeout = 5000;\r
-        logAbandoned = true;\r
-        loginTimeout = 0;\r
-        validationInterval = 0; //always validate\r
-        initSQL = null;\r
-        testOnConnect = false;;\r
-        dbProperties.setProperty("user",username);\r
-        dbProperties.setProperty("password",password);\r
-    }\r
-}\r
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.test;
+
+import java.util.Properties;
+
+import org.apache.tomcat.jdbc.pool.DataSourceFactory;
+import org.apache.tomcat.jdbc.pool.PoolProperties;
+
+/**
+ * @author Filip Hanik
+ * @version 1.0
+ */
+public class DefaultProperties extends PoolProperties {
+    public DefaultProperties() {
+        dbProperties = new Properties();
+        url = "jdbc:mysql://localhost:3306/mysql?autoReconnect=true";
+        driverClassName = "com.mysql.jdbc.Driver";
+        password = "password";
+        username = "root";
+        defaultAutoCommit = true;
+        defaultReadOnly = false;
+        defaultTransactionIsolation = DataSourceFactory.UNKNOWN_TRANSACTIONISOLATION;
+        connectionProperties = null;
+        defaultCatalog = null;
+        initialSize = 10;
+        maxActive = 100;
+        maxIdle = initialSize;
+        minIdle = initialSize;
+        maxWait = 10000;
+        validationQuery = "SELECT 1";
+        testOnBorrow = true;
+        testOnReturn = false;
+        testWhileIdle = true;
+        timeBetweenEvictionRunsMillis = 5000;
+        numTestsPerEvictionRun = 0;
+        minEvictableIdleTimeMillis = 1000;
+        accessToUnderlyingConnectionAllowed = false;
+        removeAbandoned = true;
+        removeAbandonedTimeout = 5000;
+        logAbandoned = true;
+        loginTimeout = 0;
+        validationInterval = 0; //always validate
+        initSQL = null;
+        testOnConnect = false;;
+        dbProperties.setProperty("user",username);
+        dbProperties.setProperty("password",password);
+    }
+}
index 9b83810..5de13e0 100644 (file)
-/*\r
- * Licensed to the Apache Software Foundation (ASF) under one or more\r
- * contributor license agreements.  See the NOTICE file distributed with\r
- * this work for additional information regarding copyright ownership.\r
- * The ASF licenses this file to You under the Apache License, Version 2.0\r
- * (the "License"); you may not use this file except in compliance with\r
- * the License.  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.apache.tomcat.jdbc.test;\r
-\r
-import java.lang.reflect.Method;\r
-import java.util.Properties;\r
-\r
-import org.apache.tomcat.dbcp.dbcp.BasicDataSource;\r
-import org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory;\r
-\r
-import junit.framework.TestCase;\r
-import org.apache.tomcat.jdbc.pool.PoolProperties;\r
-import org.apache.tomcat.jdbc.pool.DataSourceProxy;\r
-\r
-/**\r
- * @author Filip Hanik\r
- * @version 1.0\r
- */\r
-public class DefaultTestCase extends TestCase {\r
-    protected DataSourceProxy datasource;\r
-    protected BasicDataSource tDatasource;\r
-    protected int threadcount = 10;\r
-    protected int iterations = 100000;\r
-    public DefaultTestCase(String name) {\r
-        super(name);\r
-    }\r
-\r
-    protected void init() throws Exception {\r
-        PoolProperties p = new DefaultProperties();\r
-        p.setJmxEnabled(false);\r
-        p.setTestWhileIdle(false);\r
-        p.setTestOnBorrow(false);\r
-        p.setTestOnReturn(false);\r
-        p.setValidationInterval(30000);\r
-        p.setTimeBetweenEvictionRunsMillis(30000);\r
-        p.setMaxActive(threadcount);\r
-        p.setInitialSize(threadcount);\r
-        p.setMaxWait(10000);\r
-        p.setRemoveAbandonedTimeout(10);\r
-        p.setMinEvictableIdleTimeMillis(10000);\r
-        p.setMinIdle(threadcount);\r
-        p.setLogAbandoned(false);\r
-        p.setRemoveAbandoned(false);\r
-        datasource = new org.apache.tomcat.jdbc.pool.DataSourceProxy();\r
-        datasource.setPoolProperties(p);\r
-    }\r
-\r
-    protected void transferProperties() {\r
-        try {\r
-            BasicDataSourceFactory factory = new BasicDataSourceFactory();\r
-            Properties p = new Properties();\r
-\r
-            for (int i=0; i<this.ALL_PROPERTIES.length; i++) {\r
-                String name = "get" + Character.toUpperCase(ALL_PROPERTIES[i].charAt(0)) + ALL_PROPERTIES[i].substring(1);\r
-                String bname = "is" + name.substring(3);\r
-                Method get = null;\r
-                try {\r
-                    get = PoolProperties.class.getMethod(name, new Class[0]);\r
-                }catch (NoSuchMethodException x) {\r
-                    try {\r
-                    get = PoolProperties.class.getMethod(bname, new Class[0]);\r
-                    }catch (NoSuchMethodException x2) {\r
-                        System.err.println(x2.getMessage());\r
-                    }\r
-                }\r
-                   if (get!=null) {\r
-                       Object value = get.invoke(datasource.getPoolProperties(), new Object[0]);\r
-                       if (value!=null) {\r
-                           p.setProperty(ALL_PROPERTIES[i], value.toString());\r
-                       }\r
-                }\r
-            }\r
-            tDatasource = (BasicDataSource)factory.createDataSource(p);\r
-        }catch (Exception x) {\r
-            x.printStackTrace();\r
-        }\r
-    }\r
-\r
-\r
-    protected void tearDown() throws Exception {\r
-        datasource = null;\r
-        tDatasource = null;\r
-        System.gc();\r
-    }\r
-\r
-    private final static String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit";\r
-    private final static String PROP_DEFAULTREADONLY = "defaultReadOnly";\r
-    private final static String PROP_DEFAULTTRANSACTIONISOLATION = "defaultTransactionIsolation";\r
-    private final static String PROP_DEFAULTCATALOG = "defaultCatalog";\r
-    private final static String PROP_DRIVERCLASSNAME = "driverClassName";\r
-    private final static String PROP_MAXACTIVE = "maxActive";\r
-    private final static String PROP_MAXIDLE = "maxIdle";\r
-    private final static String PROP_MINIDLE = "minIdle";\r
-    private final static String PROP_INITIALSIZE = "initialSize";\r
-    private final static String PROP_MAXWAIT = "maxWait";\r
-    private final static String PROP_TESTONBORROW = "testOnBorrow";\r
-    private final static String PROP_TESTONRETURN = "testOnReturn";\r
-    private final static String PROP_TIMEBETWEENEVICTIONRUNSMILLIS = "timeBetweenEvictionRunsMillis";\r
-    private final static String PROP_NUMTESTSPEREVICTIONRUN = "numTestsPerEvictionRun";\r
-    private final static String PROP_MINEVICTABLEIDLETIMEMILLIS = "minEvictableIdleTimeMillis";\r
-    private final static String PROP_TESTWHILEIDLE = "testWhileIdle";\r
-    private final static String PROP_PASSWORD = "password";\r
-    private final static String PROP_URL = "url";\r
-    private final static String PROP_USERNAME = "username";\r
-    private final static String PROP_VALIDATIONQUERY = "validationQuery";\r
-    private final static String PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED = "accessToUnderlyingConnectionAllowed";\r
-    private final static String PROP_REMOVEABANDONED = "removeAbandoned";\r
-    private final static String PROP_REMOVEABANDONEDTIMEOUT = "removeAbandonedTimeout";\r
-    private final static String PROP_LOGABANDONED = "logAbandoned";\r
-    private final static String PROP_POOLPREPAREDSTATEMENTS = "poolPreparedStatements";\r
-    private final static String PROP_MAXOPENPREPAREDSTATEMENTS = "maxOpenPreparedStatements";\r
-    private final static String PROP_CONNECTIONPROPERTIES = "connectionProperties";\r
-\r
-    private final static String[] ALL_PROPERTIES = {\r
-        PROP_DEFAULTAUTOCOMMIT,\r
-        PROP_DEFAULTREADONLY,\r
-        PROP_DEFAULTTRANSACTIONISOLATION,\r
-        PROP_DEFAULTCATALOG,\r
-        PROP_DRIVERCLASSNAME,\r
-        PROP_MAXACTIVE,\r
-        PROP_MAXIDLE,\r
-        PROP_MINIDLE,\r
-        PROP_INITIALSIZE,\r
-        PROP_MAXWAIT,\r
-        PROP_TESTONBORROW,\r
-        PROP_TESTONRETURN,\r
-        PROP_TIMEBETWEENEVICTIONRUNSMILLIS,\r
-        PROP_NUMTESTSPEREVICTIONRUN,\r
-        PROP_MINEVICTABLEIDLETIMEMILLIS,\r
-        PROP_TESTWHILEIDLE,\r
-        PROP_PASSWORD,\r
-        PROP_URL,\r
-        PROP_USERNAME,\r
-        PROP_VALIDATIONQUERY,\r
-        PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED,\r
-        PROP_REMOVEABANDONED,\r
-        PROP_REMOVEABANDONEDTIMEOUT,\r
-        PROP_LOGABANDONED,\r
-        PROP_CONNECTIONPROPERTIES\r
-    };\r
-\r
-\r
-\r
-}\r
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.test;
+
+import java.lang.reflect.Method;
+import java.util.Properties;
+
+import org.apache.tomcat.dbcp.dbcp.BasicDataSource;
+import org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory;
+
+import junit.framework.TestCase;
+import org.apache.tomcat.jdbc.pool.PoolProperties;
+import org.apache.tomcat.jdbc.pool.DataSourceProxy;
+
+/**
+ * @author Filip Hanik
+ * @version 1.0
+ */
+public class DefaultTestCase extends TestCase {
+    protected DataSourceProxy datasource;
+    protected BasicDataSource tDatasource;
+    protected int threadcount = 10;
+    protected int iterations = 100000;
+    public DefaultTestCase(String name) {
+        super(name);
+    }
+
+    protected void init() throws Exception {
+        PoolProperties p = new DefaultProperties();
+        p.setJmxEnabled(false);
+        p.setTestWhileIdle(false);
+        p.setTestOnBorrow(false);
+        p.setTestOnReturn(false);
+        p.setValidationInterval(30000);
+        p.setTimeBetweenEvictionRunsMillis(30000);
+        p.setMaxActive(threadcount);
+        p.setInitialSize(threadcount);
+        p.setMaxWait(10000);
+        p.setRemoveAbandonedTimeout(10);
+        p.setMinEvictableIdleTimeMillis(10000);
+        p.setMinIdle(threadcount);
+        p.setLogAbandoned(false);
+        p.setRemoveAbandoned(false);
+        datasource = new org.apache.tomcat.jdbc.pool.DataSourceProxy();
+        datasource.setPoolProperties(p);
+    }
+
+    protected void transferProperties() {
+        try {
+            BasicDataSourceFactory factory = new BasicDataSourceFactory();
+            Properties p = new Properties();
+
+            for (int i=0; i<this.ALL_PROPERTIES.length; i++) {
+                String name = "get" + Character.toUpperCase(ALL_PROPERTIES[i].charAt(0)) + ALL_PROPERTIES[i].substring(1);
+                String bname = "is" + name.substring(3);
+                Method get = null;
+                try {
+                    get = PoolProperties.class.getMethod(name, new Class[0]);
+                }catch (NoSuchMethodException x) {
+                    try {
+                    get = PoolProperties.class.getMethod(bname, new Class[0]);
+                    }catch (NoSuchMethodException x2) {
+                        System.err.println(x2.getMessage());
+                    }
+                }
+                   if (get!=null) {
+                       Object value = get.invoke(datasource.getPoolProperties(), new Object[0]);
+                       if (value!=null) {
+                           p.setProperty(ALL_PROPERTIES[i], value.toString());
+                       }
+                }
+            }
+            tDatasource = (BasicDataSource)factory.createDataSource(p);
+        }catch (Exception x) {
+            x.printStackTrace();
+        }
+    }
+
+
+    protected void tearDown() throws Exception {
+        datasource = null;
+        tDatasource = null;
+        System.gc();
+    }
+
+    private final static String PROP_DEFAULTAUTOCOMMIT = "defaultAutoCommit";
+    private final static String PROP_DEFAULTREADONLY = "defaultReadOnly";
+    private final static String PROP_DEFAULTTRANSACTIONISOLATION = "defaultTransactionIsolation";
+    private final static String PROP_DEFAULTCATALOG = "defaultCatalog";
+    private final static String PROP_DRIVERCLASSNAME = "driverClassName";
+    private final static String PROP_MAXACTIVE = "maxActive";
+    private final static String PROP_MAXIDLE = "maxIdle";
+    private final static String PROP_MINIDLE = "minIdle";
+    private final static String PROP_INITIALSIZE = "initialSize";
+    private final static String PROP_MAXWAIT = "maxWait";
+    private final static String PROP_TESTONBORROW = "testOnBorrow";
+    private final static String PROP_TESTONRETURN = "testOnReturn";
+    private final static String PROP_TIMEBETWEENEVICTIONRUNSMILLIS = "timeBetweenEvictionRunsMillis";
+    private final static String PROP_NUMTESTSPEREVICTIONRUN = "numTestsPerEvictionRun";
+    private final static String PROP_MINEVICTABLEIDLETIMEMILLIS = "minEvictableIdleTimeMillis";
+    private final static String PROP_TESTWHILEIDLE = "testWhileIdle";
+    private final static String PROP_PASSWORD = "password";
+    private final static String PROP_URL = "url";
+    private final static String PROP_USERNAME = "username";
+    private final static String PROP_VALIDATIONQUERY = "validationQuery";
+    private final static String PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED = "accessToUnderlyingConnectionAllowed";
+    private final static String PROP_REMOVEABANDONED = "removeAbandoned";
+    private final static String PROP_REMOVEABANDONEDTIMEOUT = "removeAbandonedTimeout";
+    private final static String PROP_LOGABANDONED = "logAbandoned";
+    private final static String PROP_POOLPREPAREDSTATEMENTS = "poolPreparedStatements";
+    private final static String PROP_MAXOPENPREPAREDSTATEMENTS = "maxOpenPreparedStatements";
+    private final static String PROP_CONNECTIONPROPERTIES = "connectionProperties";
+
+    private final static String[] ALL_PROPERTIES = {
+        PROP_DEFAULTAUTOCOMMIT,
+        PROP_DEFAULTREADONLY,
+        PROP_DEFAULTTRANSACTIONISOLATION,
+        PROP_DEFAULTCATALOG,
+        PROP_DRIVERCLASSNAME,
+        PROP_MAXACTIVE,
+        PROP_MAXIDLE,
+        PROP_MINIDLE,
+        PROP_INITIALSIZE,
+        PROP_MAXWAIT,
+        PROP_TESTONBORROW,
+        PROP_TESTONRETURN,
+        PROP_TIMEBETWEENEVICTIONRUNSMILLIS,
+        PROP_NUMTESTSPEREVICTIONRUN,
+        PROP_MINEVICTABLEIDLETIMEMILLIS,
+        PROP_TESTWHILEIDLE,
+        PROP_PASSWORD,
+        PROP_URL,
+        PROP_USERNAME,
+        PROP_VALIDATIONQUERY,
+        PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED,
+        PROP_REMOVEABANDONED,
+        PROP_REMOVEABANDONEDTIMEOUT,
+        PROP_LOGABANDONED,
+        PROP_CONNECTIONPROPERTIES
+    };
+
+
+
+}
index 3aed92a..7bb8157 100644 (file)
@@ -1,43 +1,43 @@
-/*\r
- * Licensed to the Apache Software Foundation (ASF) under one or more\r
- * contributor license agreements.  See the NOTICE file distributed with\r
- * this work for additional information regarding copyright ownership.\r
- * The ASF licenses this file to You under the Apache License, Version 2.0\r
- * (the "License"); you may not use this file except in compliance with\r
- * the License.  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.apache.tomcat.jdbc.test;\r
-\r
-/**\r
- * @author Filip Hanik\r
- * @version 1.0\r
- */\r
-public class TestGCClose extends DefaultTestCase {\r
-    public TestGCClose(String name) {\r
-        super(name);\r
-    }\r
-    \r
-    public void testGCStop() throws Exception {\r
-        init();\r
-        datasource.getConnection();\r
-        System.out.println("Got a connection, but didn't return it");\r
-        tearDown();\r
-        Thread.sleep(20000);\r
-    }\r
-    \r
-    public void testClose() throws Exception {\r
-        init();\r
-        datasource.getConnection();\r
-        System.out.println("Got a connection, but didn't return it");\r
-        datasource.close(true);\r
-        Thread.sleep(20000);\r
-    }\r
-}\r
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.test;
+
+/**
+ * @author Filip Hanik
+ * @version 1.0
+ */
+public class TestGCClose extends DefaultTestCase {
+    public TestGCClose(String name) {
+        super(name);
+    }
+    
+    public void testGCStop() throws Exception {
+        init();
+        datasource.getConnection();
+        System.out.println("Got a connection, but didn't return it");
+        tearDown();
+        Thread.sleep(20000);
+    }
+    
+    public void testClose() throws Exception {
+        init();
+        datasource.getConnection();
+        System.out.println("Got a connection, but didn't return it");
+        datasource.close(true);
+        Thread.sleep(20000);
+    }
+}
index ec42ec0..b59c58d 100644 (file)
-/*\r
- * Licensed to the Apache Software Foundation (ASF) under one or more\r
- * contributor license agreements.  See the NOTICE file distributed with\r
- * this work for additional information regarding copyright ownership.\r
- * The ASF licenses this file to You under the Apache License, Version 2.0\r
- * (the "License"); you may not use this file except in compliance with\r
- * the License.  You may obtain a copy of the License at\r
- *\r
- *      http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.apache.tomcat.jdbc.test;\r
-\r
-import java.util.concurrent.atomic.AtomicInteger;\r
-\r
-/**\r
- * @author Filip Hanik\r
- * @version 1.0\r
- */\r
-public class TestTimeout extends DefaultTestCase {\r
-    public TestTimeout(String name) {\r
-        super(name);\r
-    }\r
-\r
-    AtomicInteger counter = new AtomicInteger(0);\r
-\r
-    public void testCheckoutTimeout() throws Exception {\r
-        try {\r
-            init();\r
-            this.datasource.getPoolProperties().setTestWhileIdle(true);\r
-            this.datasource.getPoolProperties().setTestOnBorrow(false);\r
-            this.datasource.getPoolProperties().setTestOnReturn(false);\r
-            this.datasource.getPoolProperties().setValidationInterval(30000);\r
-            this.datasource.getPoolProperties().setTimeBetweenEvictionRunsMillis(1000);\r
-            this.datasource.getPoolProperties().setMaxActive(20);\r
-            this.datasource.getPoolProperties().setMaxWait(3000);\r
-            this.datasource.getPoolProperties().setRemoveAbandonedTimeout(5);\r
-            this.datasource.getPoolProperties().setMinEvictableIdleTimeMillis(5000);\r
-            this.datasource.getPoolProperties().setMinIdle(5);\r
-            this.datasource.getPoolProperties().setLogAbandoned(true);\r
-            System.out.println("About to test connection pool:"+datasource);\r
-            for (int i = 0; i < 21; i++) {\r
-                long now = System.currentTimeMillis();\r
-                this.datasource.getConnection();\r
-                long delta = System.currentTimeMillis()-now;\r
-                System.out.println("Got connection #"+i+" in "+delta+" ms.");\r
-            }\r
-        } catch ( Exception x ) {\r
-            x.printStackTrace();\r
-        }finally {\r
-            Thread.sleep(20000);\r
-            tearDown();\r
-        }\r
-    }\r
-\r
-    public void testCheckoutTimeoutFair() throws Exception {\r
-        try {\r
-            init();\r
-            this.datasource.getPoolProperties().setFairQueue(true);\r
-            this.datasource.getPoolProperties().setTestWhileIdle(true);\r
-            this.datasource.getPoolProperties().setTestOnBorrow(false);\r
-            this.datasource.getPoolProperties().setTestOnReturn(false);\r
-            this.datasource.getPoolProperties().setValidationInterval(30000);\r
-            this.datasource.getPoolProperties().setTimeBetweenEvictionRunsMillis(1000);\r
-            this.datasource.getPoolProperties().setMaxActive(20);\r
-            this.datasource.getPoolProperties().setMaxWait(3000);\r
-            this.datasource.getPoolProperties().setRemoveAbandonedTimeout(5);\r
-            this.datasource.getPoolProperties().setMinEvictableIdleTimeMillis(5000);\r
-            this.datasource.getPoolProperties().setMinIdle(5);\r
-            this.datasource.getPoolProperties().setLogAbandoned(true);\r
-            System.out.println("About to test connection pool:"+datasource);\r
-            for (int i = 0; i < 21; i++) {\r
-                long now = System.currentTimeMillis();\r
-                this.datasource.getConnection();\r
-                long delta = System.currentTimeMillis()-now;\r
-                System.out.println("Got connection #"+i+" in "+delta+" ms.");\r
-            }\r
-        } catch ( Exception x ) {\r
-            x.printStackTrace();\r
-        }finally {\r
-            Thread.sleep(20000);\r
-            tearDown();\r
-        }\r
-    }\r
-    \r
-\r
-    public void testRemoveAbandoned() throws Exception {\r
-        try {\r
-            init();\r
-            this.datasource.getPoolProperties().setTestWhileIdle(true);\r
-            this.datasource.getPoolProperties().setTestOnBorrow(false);\r
-            this.datasource.getPoolProperties().setTestOnReturn(false);\r
-            this.datasource.getPoolProperties().setValidationInterval(30000);\r
-            this.datasource.getPoolProperties().setTimeBetweenEvictionRunsMillis(1000);\r
-            this.datasource.getPoolProperties().setMaxActive(20);\r
-            this.datasource.getPoolProperties().setMaxWait(3000);\r
-            this.datasource.getPoolProperties().setRemoveAbandonedTimeout(5);\r
-            this.datasource.getPoolProperties().setMinEvictableIdleTimeMillis(5000);\r
-            this.datasource.getPoolProperties().setMinIdle(5);\r
-            this.datasource.getPoolProperties().setRemoveAbandoned(true);\r
-            this.datasource.getPoolProperties().setLogAbandoned(true);\r
-            System.out.println("About to test connection pool:"+datasource);\r
-            for (int i = 0; i < threadcount; i++) {\r
-                long now = System.currentTimeMillis();\r
-                this.datasource.getConnection();\r
-                long delta = System.currentTimeMillis()-now;\r
-                System.out.println("Got connection #"+i+" in "+delta+" ms.");\r
-            }\r
-        } catch ( Exception x ) {\r
-            x.printStackTrace();\r
-        }finally {\r
-            Thread.sleep(20000);\r
-            tearDown();\r
-        }\r
-    }\r
-    \r
-    public void testRemoveAbandonedFair() throws Exception {\r
-        try {\r
-            init();\r
-            this.datasource.getPoolProperties().setFairQueue(true);\r
-            this.datasource.getPoolProperties().setTestWhileIdle(true);\r
-            this.datasource.getPoolProperties().setTestOnBorrow(false);\r
-            this.datasource.getPoolProperties().setTestOnReturn(false);\r
-            this.datasource.getPoolProperties().setValidationInterval(30000);\r
-            this.datasource.getPoolProperties().setTimeBetweenEvictionRunsMillis(1000);\r
-            this.datasource.getPoolProperties().setMaxActive(20);\r
-            this.datasource.getPoolProperties().setMaxWait(3000);\r
-            this.datasource.getPoolProperties().setRemoveAbandonedTimeout(5);\r
-            this.datasource.getPoolProperties().setMinEvictableIdleTimeMillis(5000);\r
-            this.datasource.getPoolProperties().setMinIdle(5);\r
-            this.datasource.getPoolProperties().setRemoveAbandoned(true);\r
-            this.datasource.getPoolProperties().setLogAbandoned(true);\r
-            System.out.println("About to test connection pool:"+datasource);\r
-            for (int i = 0; i < threadcount; i++) {\r
-                long now = System.currentTimeMillis();\r
-                this.datasource.getConnection();\r
-                long delta = System.currentTimeMillis()-now;\r
-                System.out.println("Got connection #"+i+" in "+delta+" ms.");\r
-            }\r
-        } catch ( Exception x ) {\r
-            x.printStackTrace();\r
-        }finally {\r
-            Thread.sleep(20000);\r
-            tearDown();\r
-        }\r
-    }\r
-\r
-\r
-}\r
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.jdbc.test;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * @author Filip Hanik
+ * @version 1.0
+ */
+public class TestTimeout extends DefaultTestCase {
+    public TestTimeout(String name) {
+        super(name);
+    }
+
+    AtomicInteger counter = new AtomicInteger(0);
+
+    public void testCheckoutTimeout() throws Exception {
+        try {
+            init();
+            this.datasource.getPoolProperties().setTestWhileIdle(true);
+            this.datasource.getPoolProperties().setTestOnBorrow(false);
+            this.datasource.getPoolProperties().setTestOnReturn(false);
+            this.datasource.getPoolProperties().setValidationInterval(30000);
+            this.datasource.getPoolProperties().setTimeBetweenEvictionRunsMillis(1000);
+            this.datasource.getPoolProperties().setMaxActive(20);
+            this.datasource.getPoolProperties().setMaxWait(3000);
+            this.datasource.getPoolProperties().setRemoveAbandonedTimeout(5);
+            this.datasource.getPoolProperties().setMinEvictableIdleTimeMillis(5000);
+            this.datasource.getPoolProperties().setMinIdle(5);
+            this.datasource.getPoolProperties().setLogAbandoned(true);
+            System.out.println("About to test connection pool:"+datasource);
+            for (int i = 0; i < 21; i++) {
+                long now = System.currentTimeMillis();
+                this.datasource.getConnection();
+                long delta = System.currentTimeMillis()-now;
+                System.out.println("Got connection #"+i+" in "+delta+" ms.");
+            }
+        } catch ( Exception x ) {
+            x.printStackTrace();
+        }finally {
+            Thread.sleep(20000);
+            tearDown();
+        }
+    }
+
+    public void testCheckoutTimeoutFair() throws Exception {
+        try {
+            init();
+            this.datasource.getPoolProperties().setFairQueue(true);
+            this.datasource.getPoolProperties().setTestWhileIdle(true);
+            this.datasource.getPoolProperties().setTestOnBorrow(false);
+            this.datasource.getPoolProperties().setTestOnReturn(false);
+            this.datasource.getPoolProperties().setValidationInterval(30000);
+            this.datasource.getPoolProperties().setTimeBetweenEvictionRunsMillis(1000);
+            this.datasource.getPoolProperties().setMaxActive(20);
+            this.datasource.getPoolProperties().setMaxWait(3000);
+            this.datasource.getPoolProperties().setRemoveAbandonedTimeout(5);
+            this.datasource.getPoolProperties().setMinEvictableIdleTimeMillis(5000);
+            this.datasource.getPoolProperties().setMinIdle(5);
+            this.datasource.getPoolProperties().setLogAbandoned(true);
+            System.out.println("About to test connection pool:"+datasource);
+            for (int i = 0; i < 21; i++) {
+                long now = System.currentTimeMillis();
+                this.datasource.getConnection();
+                long delta = System.currentTimeMillis()-now;
+                System.out.println("Got connection #"+i+" in "+delta+" ms.");
+            }
+        } catch ( Exception x ) {
+            x.printStackTrace();
+        }finally {
+            Thread.sleep(20000);
+            tearDown();
+        }
+    }
+    
+
+    public void testRemoveAbandoned() throws Exception {
+        try {
+            init();
+            this.datasource.getPoolProperties().setTestWhileIdle(true);
+            this.datasource.getPoolProperties().setTestOnBorrow(false);
+            this.datasource.getPoolProperties().setTestOnReturn(false);
+            this.datasource.getPoolProperties().setValidationInterval(30000);
+            this.datasource.getPoolProperties().setTimeBetweenEvictionRunsMillis(1000);
+            this.datasource.getPoolProperties().setMaxActive(20);
+            this.datasource.getPoolProperties().setMaxWait(3000);
+            this.datasource.getPoolProperties().setRemoveAbandonedTimeout(5);
+            this.datasource.getPoolProperties().setMinEvictableIdleTimeMillis(5000);
+            this.datasource.getPoolProperties().setMinIdle(5);
+            this.datasource.getPoolProperties().setRemoveAbandoned(true);
+            this.datasource.getPoolProperties().setLogAbandoned(true);
+            System.out.println("About to test connection pool:"+datasource);
+            for (int i = 0; i < threadcount; i++) {
+                long now = System.currentTimeMillis();
+                this.datasource.getConnection();
+                long delta = System.currentTimeMillis()-now;
+                System.out.println("Got connection #"+i+" in "+delta+" ms.");
+            }
+        } catch ( Exception x ) {
+            x.printStackTrace();
+        }finally {
+            Thread.sleep(20000);
+            tearDown();
+        }
+    }
+    
+    public void testRemoveAbandonedFair() throws Exception {
+        try {
+            init();
+            this.datasource.getPoolProperties().setFairQueue(true);
+            this.datasource.getPoolProperties().setTestWhileIdle(true);
+            this.datasource.getPoolProperties().setTestOnBorrow(false);
+            this.datasource.getPoolProperties().setTestOnReturn(false);
+            this.datasource.getPoolProperties().setValidationInterval(30000);
+            this.datasource.getPoolProperties().setTimeBetweenEvictionRunsMillis(1000);
+            this.datasource.getPoolProperties().setMaxActive(20);
+            this.datasource.getPoolProperties().setMaxWait(3000);
+            this.datasource.getPoolProperties().setRemoveAbandonedTimeout(5);
+            this.datasource.getPoolProperties().setMinEvictableIdleTimeMillis(5000);
+            this.datasource.getPoolProperties().setMinIdle(5);
+            this.datasource.getPoolProperties().setRemoveAbandoned(true);
+            this.datasource.getPoolProperties().setLogAbandoned(true);
+            System.out.println("About to test connection pool:"+datasource);
+            for (int i = 0; i < threadcount; i++) {
+                long now = System.currentTimeMillis();
+                this.datasource.getConnection();
+                long delta = System.currentTimeMillis()-now;
+                System.out.println("Got connection #"+i+" in "+delta+" ms.");
+            }
+        } catch ( Exception x ) {
+            x.printStackTrace();
+        }finally {
+            Thread.sleep(20000);
+            tearDown();
+        }
+    }
+
+
+}