Add suspect test and also allow connections to be unwrapped

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

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
index 71311bf..b6215ec 100644 (file)
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
@@ -52,6 +52,15 @@ public abstract class JdbcInterceptor implements InvocationHandler {
      * {@link javax.sql.PooledConnection#getConnection()} method name
      */
     public static final String GETCONNECTION_VAL = "getConnection";
+    /**
+     * {@link java.sql.Wrapper#unwrap(Class)} method name
+     */
+    public static final String UNWRAP_VAL = "unwrap";
+    /**
+     * {@link java.sql.Wrapper#isWrapperFor(Class)} method name
+     */
+    public static final String ISWRAPPERFOR_VAL = "isWrapperFor";
+
     
     /**
      * Properties for this interceptor.

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
index 8357846..6d8ef5b 100644 (file)
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
@@ -71,7 +71,9 @@ public class ProxyConnection extends JdbcInterceptor {
 
 
     public Object unwrap(Class<?> iface) throws SQLException {
-        if (isWrapperFor(iface)) {
+        if (iface == PooledConnection.class) {
+            return connection;
+        } else if (isWrapperFor(iface)) {
             return connection.getConnection();
         } else {
             throw new SQLException("Not a wrapper of "+iface.getName());
@@ -95,6 +97,11 @@ public class ProxyConnection extends JdbcInterceptor {
             return connection.getConnection();
         }
         if (isClosed()) throw new SQLException("Connection has already been closed.");
+        if (compare(UNWRAP_VAL,method)) {
+            return unwrap((Class<?>)args[0]);
+        } else if (compare(ISWRAPPERFOR_VAL,method)) {
+            return this.isWrapperFor((Class<?>)args[0]);
+        }
         try {
             return method.invoke(connection.getConnection(),args);
         }catch (Throwable t) {

diff --git a/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSuspectTimeout.java b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSuspectTimeout.java
new file mode 100644 (file)
index 0000000..f25e8be
--- /dev/null
+++ b/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSuspectTimeout.java
@@ -0,0 +1,50 @@
+/*
+ *  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.sql.Connection;
+
+import org.apache.tomcat.jdbc.pool.PooledConnection;
+import org.apache.tomcat.jdbc.pool.interceptor.ResetAbandonedTimer;
+
+
+public class TestSuspectTimeout extends DefaultTestCase {
+
+    public TestSuspectTimeout(String name) {
+        super(name);
+    }
+    
+    public void testSuspect() throws Exception {
+        this.init();
+        this.datasource.setMaxActive(100);
+        this.datasource.setMaxIdle(100);
+        this.datasource.setInitialSize(0);
+        this.datasource.getPoolProperties().setAbandonWhenPercentageFull(0);
+        this.datasource.getPoolProperties().setTimeBetweenEvictionRunsMillis(100);
+        this.datasource.getPoolProperties().setRemoveAbandoned(true);
+        this.datasource.getPoolProperties().setRemoveAbandonedTimeout(100);
+        this.datasource.getPoolProperties().setSuspectTimeout(1);
+        this.datasource.getPoolProperties().setLogAbandoned(true);
+        Connection con = datasource.getConnection();
+        assertEquals("Number of connections active/busy should be 1",1,datasource.getPool().getActive());
+        Thread.sleep(3000);
+        PooledConnection pcon = con.unwrap(PooledConnection.class);
+        assertTrue("Connection should be marked suspect",pcon.isSuspect());
+        con.close();
+    }
+}