<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/31fa408eec8f1262e23ee8512254c431ff6940e4">https://github.com/macports/macports-ports/commit/31fa408eec8f1262e23ee8512254c431ff6940e4</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 31fa408 commons-dbcp: remove patch files
</span>31fa408 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 31fa408eec8f1262e23ee8512254c431ff6940e4
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Mon Nov 25 10:58:13 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> commons-dbcp: remove patch files
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Commit 9eef572 removed the Portfile, but left the patchfiles
</span>---
java/commons-dbcp/files/patch-JDK-1.6.diff | 1954 ----------------------------
1 file changed, 1954 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/commons-dbcp/files/patch-JDK-1.6.diff b/java/commons-dbcp/files/patch-JDK-1.6.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2743038..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/commons-dbcp/files/patch-JDK-1.6.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,1954 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Taken from https://issues.apache.org/jira/browse/DBCP-191
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/test/org/apache/commons/dbcp/TesterPreparedStatement.java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/test/org/apache/commons/dbcp/TesterPreparedStatement.java (revision 558600)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/test/org/apache/commons/dbcp/TesterPreparedStatement.java (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,6 +28,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.sql.ResultSetMetaData;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.sql.SQLException;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.util.Calendar;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.io.InputStream;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.io.Reader;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.NClob;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.RowId;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.SQLXML;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * A dummy {@link PreparedStatement}, for testing purposes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -288,7 +295,79 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public java.sql.ParameterMetaData getParameterMetaData() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* JDBC_3_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setRowId(int parameterIndex, RowId value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setNString(int parameterIndex, String value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setNClob(int parameterIndex, NClob value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setSQLXML(int parameterIndex, SQLXML value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setAsciiStream(int parameterIndex, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setBinaryStream(int parameterIndex, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setAsciiStream(int parameterIndex, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setBinaryStream(int parameterIndex, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setNCharacterStream(int parameterIndex, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setClob(int parameterIndex, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setNClob(int parameterIndex, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/test/org/apache/commons/dbcp/TesterResultSet.java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/test/org/apache/commons/dbcp/TesterResultSet.java (revision 558600)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/test/org/apache/commons/dbcp/TesterResultSet.java (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,6 +28,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.sql.SQLWarning;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.sql.Statement;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.util.Calendar;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.io.InputStream;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.io.Reader;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.NClob;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.RowId;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.SQLXML;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * A dummy {@link ResultSet}, for testing purposes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -759,7 +766,207 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* JDBC_3_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isWrapperFor(Class<?> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public <T> T unwrap(Class<T> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public RowId getRowId(int columnIndex) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public RowId getRowId(String columnLabel) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateRowId(int columnIndex, RowId value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateRowId(String columnLabel, RowId value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public int getHoldability() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isClosed() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNString(int columnIndex, String value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNString(String columnLabel, String value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNClob(int columnIndex, NClob value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNClob(String columnLabel, NClob value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public NClob getNClob(int columnIndex) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public NClob getNClob(String columnLabel) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public SQLXML getSQLXML(int columnIndex) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public SQLXML getSQLXML(String columnLabel) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateSQLXML(int columnIndex, SQLXML value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateSQLXML(String columnLabel, SQLXML value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public String getNString(int columnIndex) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public String getNString(String columnLabel) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Reader getNCharacterStream(int columnIndex) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Reader getNCharacterStream(String columnLabel) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNCharacterStream(int columnIndex, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateAsciiStream(int columnIndex, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateBinaryStream(int columnIndex, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateCharacterStream(int columnIndex, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateAsciiStream(String columnLabel, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateBinaryStream(String columnLabel, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNCharacterStream(int columnIndex, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateAsciiStream(int columnIndex, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateBinaryStream(int columnIndex, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateCharacterStream(int columnIndex, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateAsciiStream(String columnLabel, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateBinaryStream(String columnLabel, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateClob(int columnIndex, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateClob(String columnLabel, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNClob(int columnIndex, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNClob(String columnLabel, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/test/org/apache/commons/dbcp/TesterConnection.java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/test/org/apache/commons/dbcp/TesterConnection.java (revision 558600)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/test/org/apache/commons/dbcp/TesterConnection.java (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.sql.SQLWarning;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.sql.Statement;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.util.Map;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.Array;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.Blob;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.Clob;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.NClob;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.SQLClientInfoException;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.SQLXML;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.Struct;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.util.Properties;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * A dummy {@link Connection}, for testing purposes.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -274,6 +284,59 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return prepareStatement(sql);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_3_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* JDBC_3_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isWrapperFor(Class<?> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public <T> T unwrap(Class<T> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Blob createBlob() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Clob createClob() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public NClob createNClob() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public SQLXML createSQLXML() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isValid(int timeout) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setClientInfo(String name, String value) throws SQLClientInfoException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLClientInfoException();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setClientInfo(Properties properties) throws SQLClientInfoException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLClientInfoException();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Properties getClientInfo() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public String getClientInfo(String name) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/test/org/apache/commons/dbcp/TesterStatement.java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/test/org/apache/commons/dbcp/TesterStatement.java (revision 558600)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/test/org/apache/commons/dbcp/TesterStatement.java (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -268,5 +268,26 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* JDBC_3_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isWrapperFor(Class<?> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public <T> T unwrap(Class<T> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isClosed() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setPoolable(boolean poolable) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isPoolable() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("Not implemented.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java (revision 558600)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,6 +32,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.io.InputStream;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.io.Reader;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.sql.SQLException;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.NClob;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.RowId;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.SQLXML;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * A base delegating implementation of {@link CallableStatement}.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -332,6 +337,337 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public URL getURL(String parameterName) throws SQLException
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { checkOpen(); try { return _stmt.getURL(parameterName); } catch (SQLException e) { handleException(e); return null; } }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_3_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* JDBC_3_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public RowId getRowId(int parameterIndex) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _stmt.getRowId(parameterIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public RowId getRowId(String parameterName) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _stmt.getRowId(parameterName);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setRowId(String parameterName, RowId value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setRowId(parameterName, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setNString(String parameterName, String value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setNString(parameterName, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setNCharacterStream(String parameterName, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setNCharacterStream(parameterName, reader, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setNClob(String parameterName, NClob value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setNClob(parameterName, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setClob(String parameterName, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setClob(parameterName, reader, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setBlob(parameterName, inputStream, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setNClob(String parameterName, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setNClob(parameterName, reader, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public NClob getNClob(int parameterIndex) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _stmt.getNClob(parameterIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public NClob getNClob(String parameterName) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _stmt.getNClob(parameterName);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setSQLXML(String parameterName, SQLXML value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setSQLXML(parameterName, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public SQLXML getSQLXML(int parameterIndex) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _stmt.getSQLXML(parameterIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public SQLXML getSQLXML(String parameterName) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _stmt.getSQLXML(parameterName);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public String getNString(int parameterIndex) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _stmt.getNString(parameterIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public String getNString(String parameterName) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _stmt.getNString(parameterName);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Reader getNCharacterStream(int parameterIndex) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _stmt.getNCharacterStream(parameterIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Reader getNCharacterStream(String parameterName) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _stmt.getNCharacterStream(parameterName);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Reader getCharacterStream(int parameterIndex) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _stmt.getCharacterStream(parameterIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Reader getCharacterStream(String parameterName) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _stmt.getCharacterStream(parameterName);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setBlob(String parameterName, Blob blob) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setBlob(parameterName, blob);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setClob(String parameterName, Clob clob) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setClob(parameterName, clob);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setAsciiStream(String parameterName, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setAsciiStream(parameterName, inputStream, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setBinaryStream(String parameterName, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setBinaryStream(parameterName, inputStream, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setCharacterStream(String parameterName, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setCharacterStream(parameterName, reader, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setAsciiStream(String parameterName, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setAsciiStream(parameterName, inputStream);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setBinaryStream(String parameterName, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setBinaryStream(parameterName, inputStream);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setCharacterStream(String parameterName, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setCharacterStream(parameterName, reader);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setNCharacterStream(String parameterName, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setNCharacterStream(parameterName, reader);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setClob(String parameterName, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setClob(parameterName, reader);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setBlob(String parameterName, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setBlob(parameterName, inputStream);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setNClob(String parameterName, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setNClob(parameterName, reader);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java (revision 558600)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/java/org/apache/commons/dbcp/cpdsadapter/ConnectionImpl.java (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -25,6 +25,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.sql.Statement;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.sql.SQLWarning;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.sql.SQLException;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.Array;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.Blob;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.ClientInfoStatus;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.Clob;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.NClob;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.SQLClientInfoException;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.SQLXML;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.Struct;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.util.Collections;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.util.Map;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.util.Properties;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * This class is the <code>Connection</code> that will be returned
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,6 +55,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private static final String CLOSED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- = "Attempted to use Connection after closed() was called.";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ private static final Map<String, ClientInfoStatus> EMPTY_FAILED_PROPERTIES =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Collections.<String, ClientInfoStatus>emptyMap();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /** The JDBC database connection. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private Connection connection;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -453,6 +471,86 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- assertOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return connection.prepareStatement(sql, columnNames);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_3_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* JDBC_3_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isWrapperFor(Class<?> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return connection.isWrapperFor(iface);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public <T> T unwrap(Class<T> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return connection.unwrap(iface);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assertOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return connection.createArrayOf(typeName, elements);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Blob createBlob() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assertOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return connection.createBlob();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Clob createClob() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assertOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return connection.createClob();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public NClob createNClob() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assertOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return connection.createNClob();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public SQLXML createSQLXML() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assertOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return connection.createSQLXML();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assertOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return connection.createStruct(typeName, attributes);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isValid(int timeout) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assertOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return connection.isValid(timeout);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setClientInfo(String name, String value) throws SQLClientInfoException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assertOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ connection.setClientInfo(name, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLClientInfoException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw e;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLClientInfoException("Connection is closed.", EMPTY_FAILED_PROPERTIES, e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setClientInfo(Properties properties) throws SQLClientInfoException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assertOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ connection.setClientInfo(properties);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLClientInfoException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw e;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLClientInfoException("Connection is closed.", EMPTY_FAILED_PROPERTIES, e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Properties getClientInfo() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assertOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return connection.getClientInfo();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public String getClientInfo(String name) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assertOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return connection.getClientInfo(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java (revision 558600)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,6 +26,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import javax.sql.ConnectionEvent;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import javax.sql.ConnectionEventListener;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import javax.sql.PooledConnection;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import javax.sql.StatementEventListener;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import org.apache.commons.dbcp.DelegatingConnection;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import org.apache.commons.dbcp.DelegatingPreparedStatement;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -66,6 +67,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private Vector eventListeners;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * StatementEventListeners
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ private Vector statementEventListeners;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * flag set to true, once close() is called.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- boolean isClosed;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -101,6 +107,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void addStatementEventListener(StatementEventListener listener) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!statementEventListeners.contains(listener)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ statementEventListeners.add(listener);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Closes the physical connection and marks this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * <code>PooledConnection</code> so that it may not be used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -169,6 +181,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- eventListeners.remove(listener);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void removeStatementEventListener(StatementEventListener listener) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ statementEventListeners.remove(listener);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Closes the physical connection and checks that the logical connection
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * was closed as well.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java (revision 558600)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,6 +27,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.sql.ResultSetMetaData;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.sql.SQLException;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.util.Calendar;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.io.InputStream;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.io.Reader;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.NClob;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.RowId;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.SQLXML;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * A base delegating implementation of {@link PreparedStatement}.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -221,6 +228,187 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public java.sql.ParameterMetaData getParameterMetaData() throws SQLException
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { checkOpen(); try { return _stmt.getParameterMetaData(); } catch (SQLException e) { handleException(e); return null; } }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_3_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* JDBC_3_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setRowId(int parameterIndex, RowId value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setRowId(parameterIndex, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setNString(int parameterIndex, String value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setNString(parameterIndex, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setNCharacterStream(parameterIndex, value, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setNClob(int parameterIndex, NClob value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setNClob(parameterIndex, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setClob(int parameterIndex, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setClob(parameterIndex, reader, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setBlob(parameterIndex, inputStream, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setNClob(int parameterIndex, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setNClob(parameterIndex, reader, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setSQLXML(int parameterIndex, SQLXML value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setSQLXML(parameterIndex, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setAsciiStream(int parameterIndex, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setAsciiStream(parameterIndex, inputStream, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setBinaryStream(int parameterIndex, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setBinaryStream(parameterIndex, inputStream, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setCharacterStream(parameterIndex, reader, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setAsciiStream(int parameterIndex, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setAsciiStream(parameterIndex, inputStream);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setBinaryStream(int parameterIndex, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setBinaryStream(parameterIndex, inputStream);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setCharacterStream(parameterIndex, reader);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setNCharacterStream(int parameterIndex, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setNCharacterStream(parameterIndex, reader);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setClob(int parameterIndex, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setClob(parameterIndex, reader);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setBlob(parameterIndex, inputStream);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setNClob(int parameterIndex, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setNClob(parameterIndex, reader);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/java/org/apache/commons/dbcp/DelegatingResultSet.java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/java/org/apache/commons/dbcp/DelegatingResultSet.java (revision 558600)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/java/org/apache/commons/dbcp/DelegatingResultSet.java (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,6 +34,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.sql.Clob;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.sql.Array;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.util.Calendar;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.NClob;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.RowId;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.SQLXML;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * A base delegating implementation of {@link ResultSet}.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -585,6 +590,459 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public void updateArray(String columnName, java.sql.Array x) throws SQLException
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { try { _res.updateArray(columnName, x); } catch (SQLException e) { handleException(e); } }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_3_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* JDBC_3_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isWrapperFor(Class<?> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _res.isWrapperFor(iface);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public <T> T unwrap(Class<T> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _res.unwrap(iface);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public RowId getRowId(int columnIndex) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _res.getRowId(columnIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public RowId getRowId(String columnLabel) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _res.getRowId(columnLabel);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateRowId(int columnIndex, RowId value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateRowId(columnIndex, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateRowId(String columnLabel, RowId value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateRowId(columnLabel, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public int getHoldability() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _res.getHoldability();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isClosed() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _res.isClosed();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNString(int columnIndex, String value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateNString(columnIndex, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNString(String columnLabel, String value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateNString(columnLabel, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNClob(int columnIndex, NClob value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateNClob(columnIndex, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNClob(String columnLabel, NClob value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateNClob(columnLabel, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public NClob getNClob(int columnIndex) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _res.getNClob(columnIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public NClob getNClob(String columnLabel) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _res.getNClob(columnLabel);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public SQLXML getSQLXML(int columnIndex) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _res.getSQLXML(columnIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public SQLXML getSQLXML(String columnLabel) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _res.getSQLXML(columnLabel);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateSQLXML(int columnIndex, SQLXML value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateSQLXML(columnIndex, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateSQLXML(String columnLabel, SQLXML value) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateSQLXML(columnLabel, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public String getNString(int columnIndex) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _res.getNString(columnIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public String getNString(String columnLabel) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _res.getNString(columnLabel);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Reader getNCharacterStream(int columnIndex) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _res.getNCharacterStream(columnIndex);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Reader getNCharacterStream(String columnLabel) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _res.getNCharacterStream(columnLabel);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNCharacterStream(int columnIndex, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateNCharacterStream(columnIndex, reader, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateNCharacterStream(columnLabel, reader, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateAsciiStream(int columnIndex, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateAsciiStream(columnIndex, inputStream, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateBinaryStream(int columnIndex, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateBinaryStream(columnIndex, inputStream, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateCharacterStream(int columnIndex, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateCharacterStream(columnIndex, reader, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateAsciiStream(String columnLabel, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateAsciiStream(columnLabel, inputStream, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateBinaryStream(String columnLabel, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateBinaryStream(columnLabel, inputStream, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateCharacterStream(columnLabel, reader, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateBlob(columnIndex, inputStream, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateBlob(columnLabel, inputStream, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateClob(columnIndex, reader, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateClob(columnLabel, reader, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateNClob(columnIndex, reader, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateNClob(columnLabel, reader, length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNCharacterStream(int columnIndex, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateNCharacterStream(columnIndex, reader);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateNCharacterStream(columnLabel, reader);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateAsciiStream(int columnIndex, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateAsciiStream(columnIndex, inputStream);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateBinaryStream(int columnIndex, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateBinaryStream(columnIndex, inputStream);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateCharacterStream(int columnIndex, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateCharacterStream(columnIndex, reader);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateAsciiStream(String columnLabel, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateAsciiStream(columnLabel, inputStream);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateBinaryStream(String columnLabel, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateBinaryStream(columnLabel, inputStream);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateCharacterStream(columnLabel, reader);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateBlob(columnIndex, inputStream);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateBlob(columnLabel, inputStream);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateClob(int columnIndex, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateClob(columnIndex, reader);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateClob(String columnLabel, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateClob(columnLabel, reader);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNClob(int columnIndex, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateNClob(columnIndex, reader);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void updateNClob(String columnLabel, Reader reader) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res.updateNClob(columnLabel, reader);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/java/org/apache/commons/dbcp/PoolingDataSource.java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/java/org/apache/commons/dbcp/PoolingDataSource.java (revision 558600)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/java/org/apache/commons/dbcp/PoolingDataSource.java (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -84,6 +84,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public void setAccessToUnderlyingConnectionAllowed(boolean allow) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this.accessToUnderlyingConnectionAllowed = allow;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isWrapperFor(Class<?> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public <T> T unwrap(Class<T> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("PoolingDataSource is not a wrapper.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //--- DataSource methods -----------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/java/org/apache/commons/dbcp/DelegatingConnection.java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/java/org/apache/commons/dbcp/DelegatingConnection.java (revision 558600)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/java/org/apache/commons/dbcp/DelegatingConnection.java (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,6 +26,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.sql.Statement;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.util.List;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import java.util.Map;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.Array;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.Blob;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.ClientInfoStatus;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.Clob;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.NClob;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.SQLClientInfoException;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.SQLXML;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.sql.Struct;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.util.Collections;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.util.Map;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+import java.util.Properties;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * A base delegating implementation of {@link Connection}.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,6 +63,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public class DelegatingConnection extends AbandonedTrace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- implements Connection {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ private static final Map<String, ClientInfoStatus> EMPTY_FAILED_PROPERTIES =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Collections.<String, ClientInfoStatus>emptyMap();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /** My delegate {@link Connection}. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- protected Connection _conn = null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -495,4 +512,139 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* JDBC_3_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isWrapperFor(Class<?> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _conn.isWrapperFor(iface);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public <T> T unwrap(Class<T> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _conn.unwrap(iface);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _conn.createArrayOf(typeName, elements);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Blob createBlob() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _conn.createBlob();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Clob createClob() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _conn.createClob();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public NClob createNClob() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _conn.createNClob();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public SQLXML createSQLXML() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _conn.createSQLXML();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _conn.createStruct(typeName, attributes);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isValid(int timeout) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _conn.isValid(timeout);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setClientInfo(String name, String value) throws SQLClientInfoException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _conn.setClientInfo(name, value);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLClientInfoException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw e;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLClientInfoException("Connection is closed.", EMPTY_FAILED_PROPERTIES, e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setClientInfo(Properties properties) throws SQLClientInfoException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _conn.setClientInfo(properties);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLClientInfoException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw e;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLClientInfoException("Connection is closed.", EMPTY_FAILED_PROPERTIES, e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public Properties getClientInfo() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _conn.getClientInfo();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public String getClientInfo(String name) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _conn.getClientInfo(name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return null;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/java/org/apache/commons/dbcp/DelegatingStatement.java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/java/org/apache/commons/dbcp/DelegatingStatement.java (revision 558600)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/java/org/apache/commons/dbcp/DelegatingStatement.java (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -128,10 +128,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- protected boolean _closed = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- protected boolean isClosed() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return _closed;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- protected void checkOpen() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(isClosed()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- throw new SQLException
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -346,4 +342,39 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { checkOpen(); try { return _stmt.getResultSetHoldability(); } catch (SQLException e) { handleException(e); return 0; } }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* JDBC_3_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_BEGIN */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isWrapperFor(Class<?> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _conn.isWrapperFor(iface);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public <T> T unwrap(Class<T> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _conn.unwrap(iface);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isClosed() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _closed;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public void setPoolable(boolean poolable) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _stmt.setPoolable(poolable);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isPoolable() throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ checkOpen();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return _stmt.isPoolable();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ catch (SQLException e) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ handleException(e);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* JDBC_4_ANT_KEY_END */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/java/org/apache/commons/dbcp/BasicDataSource.java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/java/org/apache/commons/dbcp/BasicDataSource.java (revision 558600)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/java/org/apache/commons/dbcp/BasicDataSource.java (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1115,7 +1115,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isWrapperFor(Class<?> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public <T> T unwrap(Class<T> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("BasicDataSource is not a wrapper.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // ------------------------------------------------------ Protected Methods
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java (revision 558600)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -154,6 +154,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public abstract void close() throws Exception;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public boolean isWrapperFor(Class<?> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ public <T> T unwrap(Class<T> iface) throws SQLException {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new SQLException("InstanceKeyDataSource is not a wrapper.");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // -------------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Properties
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: project.properties
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- project.properties (revision 558600)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ project.properties (working copy)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,8 +30,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # JDK level
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--maven.compile.source=1.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--maven.compile.target=1.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+maven.compile.source=1.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+maven.compile.target=1.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Merge in a file containing just Built-By attribute
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- maven.jar.manifest=${basedir}/manifestMods.txt
</span></pre><pre style='margin:0'>
</pre>