Author: fhanik
Date: Fri Nov 13 22:22:50 2009
New Revision: 836028
URL: http://svn.apache.org/viewvc?rev=836028&view=rev
Log:
Add suspect test and also allow connections to be unwrapped
Added:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSuspectTimeout.java
(with props)
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java?rev=836028&r1=836027&r2=836028&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/JdbcInterceptor.java
Fri Nov 13 22:22:50 2009
@@ -52,6 +52,15 @@
* {...@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.
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java?rev=836028&r1=836027&r2=836028&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java
Fri Nov 13 22:22:50 2009
@@ -71,7 +71,9 @@
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 @@
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) {
Added:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSuspectTimeout.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSuspectTimeout.java?rev=836028&view=auto
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSuspectTimeout.java
(added)
+++
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSuspectTimeout.java
Fri Nov 13 22:22:50 2009
@@ -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();
+ }
+}
Propchange:
tomcat/trunk/modules/jdbc-pool/test/org/apache/tomcat/jdbc/test/TestSuspectTimeout.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
