[patch] StatementFinalizer patch

StatementFinalizer.diff (text/plain), 3.81 KB, created by Danila Galimov on 2014-04-02 17:28:48 UTC

(hide)

Description: StatementFinalizer patch

Filename:

MIME Type:

Creator: Danila Galimov

Created: 2014-04-02 17:28:48 UTC

Size: 3.81 KB

patch

obsolete

>Index: org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java >=================================================================== >--- org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java (revision 1583445) >+++ org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java (working copy) >@@ -20,10 +20,12 @@ > import java.lang.reflect.Method; > import java.sql.Statement; > import java.util.ArrayList; >+import java.util.Map; > > import org.apache.juli.logging.Log; > import org.apache.juli.logging.LogFactory; > import org.apache.tomcat.jdbc.pool.ConnectionPool; >+import org.apache.tomcat.jdbc.pool.PoolProperties; > import org.apache.tomcat.jdbc.pool.PooledConnection; > /** > * Keeps track of statements associated with a connection and invokes close upon {@link java.sql.Connection#close()} >@@ -34,15 +36,14 @@ > public class StatementFinalizer extends AbstractCreateStatementInterceptor { > private static final Log log = LogFactory.getLog(StatementFinalizer.class); > >- protected ArrayList<WeakReference<Statement>> statements = new ArrayList<WeakReference<Statement>>(); >+ private boolean logCreationStack = false; > >+ protected ArrayList<WeakReference<StatementEntry>> statements = new ArrayList<WeakReference<StatementEntry>>(); >+ > @Override > public Object createStatement(Object proxy, Method method, Object[] args, Object statement, long time) { >- try { >- if (statement instanceof Statement) >- statements.add(new WeakReference<Statement>((Statement)statement)); >- }catch (ClassCastException x) { >- //ignore this one >+ if (statement instanceof Statement) { >+ statements.add(new WeakReference<StatementEntry>(new StatementEntry((Statement) statement))); > } > return statement; > } >@@ -50,11 +51,17 @@ > @Override > public void closeInvoked() { > while (statements.size()>0) { >- WeakReference<Statement> ws = statements.remove(0); >- Statement st = ws.get(); >- if (st!=null) { >+ WeakReference<StatementEntry> ws = statements.remove(0); >+ StatementEntry se = ws.get(); >+ if (se!=null) { >+ Statement st = se.getStatement(); > try { >- st.close(); >+ if (!st.isClosed()) { >+ if (logCreationStack) { >+ log.warn("Statement created, but was not closed ", se.getAllocationStack()); >+ } >+ st.close(); >+ } > } catch (Exception ignore) { > if (log.isDebugEnabled()) { > log.debug("Unable to closed statement upon connection close.",ignore); >@@ -65,6 +72,16 @@ > } > > @Override >+ public void setProperties(Map<String, PoolProperties.InterceptorProperty> properties) { >+ super.setProperties(properties); >+ >+ PoolProperties.InterceptorProperty logProperty = properties.get("logCreationStack"); >+ if (null != logProperty) { >+ logCreationStack = logProperty.getValueAsBoolean(logCreationStack); >+ } >+ } >+ >+ @Override > public void reset(ConnectionPool parent, PooledConnection con) { > statements.clear(); > super.reset(parent, con); >@@ -71,4 +88,23 @@ > } > > >+ protected class StatementEntry { >+ private Statement statement; >+ private Throwable allocationStack; >+ >+ public StatementEntry(Statement statement) { >+ this.statement = statement; >+ if (logCreationStack) { >+ this.allocationStack = new Throwable(); >+ } >+ } >+ >+ public Statement getStatement() { >+ return statement; >+ } >+ >+ public Throwable getAllocationStack() { >+ return allocationStack; >+ } >+ } > } View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]