Make sure it compiles with JDK1.5, this is one of the times you wish you had preproce...

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

diff --git a/modules/jdbc-pool/build.xml b/modules/jdbc-pool/build.xml
index 2bab6e3..0101097 100644 (file)
--- a/modules/jdbc-pool/build.xml
+++ b/modules/jdbc-pool/build.xml
@@ -221,4 +221,7 @@
     <delete file="${base.path}/file.tar"/>
     <delete file="${base.path}/file.tar.gz"/>
   </target>
+  <target name="f">
+    <echoproperties/>
+  </target>
 </project>

diff --git a/modules/jdbc-pool/doc/changelog.xml b/modules/jdbc-pool/doc/changelog.xml
index 861d693..8b01dbf 100644 (file)
--- a/modules/jdbc-pool/doc/changelog.xml
+++ b/modules/jdbc-pool/doc/changelog.xml
@@ -31,6 +31,7 @@
 <section name="Tomcat JDBC Connection Pool v1.0.2-beta">
   <subsection name="pool">
     <changelog>
+      <update><rev>717972</rev>Added an interceptor that will clean up non closed statements when a connection is returned to the pool. (<code>org.apache.tomcat.jdbc.pool.interceptor.StatementFinalizer</code>)</update>
       <update><rev>713763</rev>Improve connection state handling</update>
       <fix><bug></bug> <rev>713763</rev>Improve connection state handling</fix>
     </changelog>

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
index 30447f0..ccee34d 100644 (file)
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
@@ -51,9 +51,7 @@ public class StatementFinalizer extends AbstractCreateStatementInterceptor {
             Statement st = ws.get();
             if (st!=null) {
                 try {
-                    if (!st.isClosed()) {
-                        st.close();
-                    }
+                    st.close();
                 } catch (Exception ignore) {
                     if (log.isDebugEnabled()) {
                         log.debug("Unable to closed statement upon connection close.",ignore);
@@ -62,5 +60,4 @@ public class StatementFinalizer extends AbstractCreateStatementInterceptor {
             }
         }
     }
-
 }