From ccca59c6a1bbb2434db725c476726b9142fe14d3 Mon Sep 17 00:00:00 2001 From: fhanik Date: Thu, 13 Nov 2008 18:59:24 +0000 Subject: [PATCH] fix for calling close multiple times git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@713787 13f79535-47bb-0310-9956-ffa450edef68 --- .../jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java index 871a56ea6..5c7236738 100644 --- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java +++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java @@ -71,8 +71,8 @@ public class ProxyConnection extends JdbcInterceptor { if (ISCLOSED_VAL==method.getName()) { return isClosed(); } - if (isClosed()) throw new SQLException("Connection has already been closed."); if (CLOSE_VAL==method.getName()) { + if (isClosed()) return null; //noop for already closed. PooledConnection poolc = this.connection; this.connection = null; pool.returnConnection(poolc); @@ -80,6 +80,7 @@ public class ProxyConnection extends JdbcInterceptor { } else if (TOSTRING_VAL==method.getName()) { return this.toString(); } + if (isClosed()) throw new SQLException("Connection has already been closed."); return method.invoke(connection.getConnection(),args); } -- 2.11.0