Author: kfujino
Date: Wed Jul 20 06:29:33 2016
New Revision: 1753457
URL: http://svn.apache.org/viewvc?rev=1753457&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=59850
Ensure that the ResultSet is closed when enabling the StatementCache
interceptor.
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java?rev=1753457&r1=1753456&r2=1753457&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
(original)
+++
tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementCache.java
Wed Jul 20 06:29:33 2016
@@ -18,6 +18,7 @@ package org.apache.tomcat.jdbc.pool.inte
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.sql.ResultSet;
import java.sql.Statement;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -236,6 +237,11 @@ public class StatementCache extends Stat
//cache a proxy so that we don't reuse the facade
CachedStatement proxy = new
CachedStatement(getDelegate(),getSql());
try {
+ // clear Resultset
+ ResultSet result = getDelegate().getResultSet();
+ if (result != null && !result.isClosed()) {
+ result.close();
+ }
//create a new facade
Object actualProxy = getConstructor().newInstance(new
Object[] { proxy });
proxy.setActualProxy(actualProxy);
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1753457&r1=1753456&r2=1753457&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Jul 20 06:29:33 2016
@@ -169,6 +169,10 @@
remove the check code of the execution interval in the task that has
been scheduled. (kfujino)
</fix>
+ <fix>
+ <bug>59850</bug>: Ensure that the <code>ResultSet</code> is closed when
+ enabling the <code>StatementCache</code> interceptor. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
