Author: fhanik
Date: Sat Nov 15 19:41:42 2008
New Revision: 717974
URL: http://svn.apache.org/viewvc?rev=717974&view=rev
Log:
Make sure it compiles with JDK1.5, this is one of the times you wish you had
preprocessor statements
Modified:
tomcat/trunk/modules/jdbc-pool/build.xml
tomcat/trunk/modules/jdbc-pool/doc/changelog.xml
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=717974&r1=717973&r2=717974&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Sat Nov 15 19:41:42 2008
@@ -221,4 +221,7 @@
<delete file="${base.path}/file.tar"/>
<delete file="${base.path}/file.tar.gz"/>
</target>
+ <target name="f">
+ <echoproperties/>
+ </target>
</project>
Modified: tomcat/trunk/modules/jdbc-pool/doc/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/changelog.xml?rev=717974&r1=717973&r2=717974&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/doc/changelog.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/changelog.xml Sat Nov 15 19:41:42 2008
@@ -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>
Modified:
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java?rev=717974&r1=717973&r2=717974&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
Sat Nov 15 19:41:42 2008
@@ -51,9 +51,7 @@
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 @@
}
}
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
