Author: kfujino
Date: Thu Feb 1 08:40:38 2018
New Revision: 1822859
URL: http://svn.apache.org/viewvc?rev=1822859&view=rev
Log:
Simplify the code.
Not need to search the JdbcInterceptor chain to get PooledConnection.
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ResetAbandonedTimer.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ResetAbandonedTimer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ResetAbandonedTimer.java?rev=1822859&r1=1822858&r2=1822859&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ResetAbandonedTimer.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/ResetAbandonedTimer.java
Thu Feb 1 08:40:38 2018
@@ -19,9 +19,8 @@ package org.apache.tomcat.jdbc.pool.inte
import java.lang.reflect.Method;
-import org.apache.tomcat.jdbc.pool.JdbcInterceptor;
+import org.apache.tomcat.jdbc.pool.ConnectionPool;
import org.apache.tomcat.jdbc.pool.PooledConnection;
-import org.apache.tomcat.jdbc.pool.ProxyConnection;
/**
* Class that resets the abandoned timer on any activity on the
@@ -33,28 +32,30 @@ import org.apache.tomcat.jdbc.pool.Proxy
*/
public class ResetAbandonedTimer extends AbstractQueryReport {
+ private PooledConnection pcon;
+
public ResetAbandonedTimer() {
}
+ @Override
+ public void reset(ConnectionPool parent, PooledConnection con) {
+ super.reset(parent, con);
+ if (con == null) {
+ this.pcon = null;
+ } else {
+ this.pcon = con;
+ }
+ }
+
public boolean resetTimer() {
boolean result = false;
- JdbcInterceptor interceptor = this.getNext();
- while (interceptor!=null && result==false) {
- if (interceptor instanceof ProxyConnection) {
- PooledConnection con =
((ProxyConnection)interceptor).getConnection();
- if (con!=null) {
- con.setTimestamp(System.currentTimeMillis());
- result = true;
- } else {
- break;
- }
- }
- interceptor = interceptor.getNext();
+ if (pcon != null) {
+ pcon.setTimestamp(System.currentTimeMillis());
+ result = true;
}
return result;
}
-
@Override
public Object invoke(Object proxy, Method method, Object[] args) throws
Throwable {
Object result = super.invoke(proxy, method, args);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
