Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@jackrabbit.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r812075 - in
 /jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db:
 ConnectionHelper.java DataSourceWrapper.java ResultSetWrapper.java
Date: Mon, 07 Sep 2009 10:55:01 -0000
To: commits@jackrabbit.apache.org
From: martijnh@apache.org
Message-Id: <20090907105501.84C30238888E@eris.apache.org>

Author: martijnh
Date: Mon Sep  7 10:55:01 2009
New Revision: 812075

URL: http://svn.apache.org/viewvc?rev=812075&view=rev
Log:
JCR-1456 Database connection pooling

* Make it work on Java 6

Modified:
    jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java
    jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/DataSourceWrapper.java
    jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ResultSetWrapper.java

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java?rev=812075&r1=812074&r2=812075&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ConnectionHelper.java Mon Sep  7 10:55:01 2009
@@ -319,9 +319,9 @@
                 return null;
             }
             if (inBatchMode) {
-                return new ResultSetWrapper(null, stmt, rs);
+                return ResultSetWrapper.newInstance(null, stmt, rs);
             } else {
-                return new ResultSetWrapper(con, stmt, rs);
+                return ResultSetWrapper.newInstance(con, stmt, rs);
             }
         } catch (SQLException e) {
             closeResources(con, stmt, rs);

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/DataSourceWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/DataSourceWrapper.java?rev=812075&r1=812074&r2=812075&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/DataSourceWrapper.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/DataSourceWrapper.java Mon Sep  7 10:55:01 2009
@@ -24,39 +24,48 @@
 
 public class DataSourceWrapper implements DataSource {
 
-	private final DataSource dataSource;
-	private final String username;
-	private final String password;
-	
-	public DataSourceWrapper(DataSource dataSource, String username, String password) {
-		this.dataSource = dataSource;
-		this.username = username;
-		this.password = password;
-	}
-	
-	public Connection getConnection() throws SQLException {
-		return dataSource.getConnection(username, password);
-	}
-
-	public Connection getConnection(String username, String password)
-			throws SQLException {
-		return dataSource.getConnection(username, password);
-	}
-
-	public PrintWriter getLogWriter() throws SQLException {
-		return dataSource.getLogWriter();
-	}
-
-	public int getLoginTimeout() throws SQLException {
-		return dataSource.getLoginTimeout();
-	}
-
-	public void setLogWriter(PrintWriter out) throws SQLException {
-		dataSource.setLogWriter(out);
-	}
-
-	public void setLoginTimeout(int seconds) throws SQLException {
-		dataSource.setLoginTimeout(seconds);
-	}
+    private final DataSource dataSource;
+
+    private final String username;
+
+    private final String password;
+
+    public DataSourceWrapper(DataSource dataSource, String username, String password) {
+        this.dataSource = dataSource;
+        this.username = username;
+        this.password = password;
+    }
+
+    public boolean isWrapperFor(Class<?> arg0) throws SQLException {
+        throw new UnsupportedOperationException("Java 6 method not supported");
+    }
+
+    public <T> T unwrap(Class<T> arg0) throws SQLException {
+        throw new UnsupportedOperationException("Java 6 method not supported");
+    }
+
+    public Connection getConnection() throws SQLException {
+        return dataSource.getConnection(username, password);
+    }
+
+    public Connection getConnection(String username, String password) throws SQLException {
+        return dataSource.getConnection(username, password);
+    }
+
+    public PrintWriter getLogWriter() throws SQLException {
+        return dataSource.getLogWriter();
+    }
+
+    public int getLoginTimeout() throws SQLException {
+        return dataSource.getLoginTimeout();
+    }
+
+    public void setLogWriter(PrintWriter out) throws SQLException {
+        dataSource.setLogWriter(out);
+    }
+
+    public void setLoginTimeout(int seconds) throws SQLException {
+        dataSource.setLoginTimeout(seconds);
+    }
 
 }

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ResultSetWrapper.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ResultSetWrapper.java?rev=812075&r1=812074&r2=812075&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ResultSetWrapper.java (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/util/db/ResultSetWrapper.java Mon Sep  7 10:55:01 2009
@@ -16,31 +16,17 @@
  */
 package org.apache.jackrabbit.core.util.db;
 
-import java.io.InputStream;
-import java.io.Reader;
-import java.math.BigDecimal;
-import java.net.URL;
-import java.sql.Array;
-import java.sql.Blob;
-import java.sql.Clob;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
 import java.sql.Connection;
-import java.sql.Date;
-import java.sql.Ref;
 import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.SQLWarning;
 import java.sql.Statement;
-import java.sql.Time;
-import java.sql.Timestamp;
-import java.util.Calendar;
-import java.util.Map;
-
 
 /**
- * 
+ * This is a dynamic proxy in order to support both Java 5 and 6.
  */
-public final class ResultSetWrapper implements ResultSet {
+public final class ResultSetWrapper implements InvocationHandler {
 
     private final Connection connection;
 
@@ -48,565 +34,33 @@
 
     private final ResultSet resultSet;
 
-    public ResultSetWrapper(Connection con, Statement stmt, ResultSet rs) {
+    /**
+     * @param con
+     * @param stmt
+     * @param rs
+     * @return
+     */
+    public static final ResultSet newInstance(Connection con, Statement stmt, ResultSet rs) {
+        ResultSetWrapper proxy = new ResultSetWrapper(con, stmt, rs);
+        return (ResultSet) Proxy.newProxyInstance(rs.getClass().getClassLoader(),
+            new Class<?>[]{ResultSet.class}, proxy);
+    }
+
+    private ResultSetWrapper(Connection con, Statement stmt, ResultSet rs) {
         connection = con;
         statement = stmt;
         resultSet = rs;
     }
 
-    public boolean absolute(int row) throws SQLException {
-        return resultSet.absolute(row);
-    }
-
-    public void afterLast() throws SQLException {
-        resultSet.afterLast();
-    }
-
-    public void beforeFirst() throws SQLException {
-        resultSet.beforeFirst();
-    }
-
-    public void cancelRowUpdates() throws SQLException {
-        resultSet.cancelRowUpdates();
-    }
-
-    public void clearWarnings() throws SQLException {
-        resultSet.clearWarnings();
-    }
-
-    public void close() throws SQLException {
-        DbUtility.close(connection, statement, resultSet);
-    }
-
-    public void deleteRow() throws SQLException {
-        resultSet.deleteRow();
-    }
-
-    public int findColumn(String columnName) throws SQLException {
-        return resultSet.findColumn(columnName);
-    }
-
-    public boolean first() throws SQLException {
-        return resultSet.first();
-    }
-
-    public Array getArray(int i) throws SQLException {
-        return resultSet.getArray(i);
-    }
-
-    public Array getArray(String colName) throws SQLException {
-        return resultSet.getArray(colName);
-    }
-
-    public InputStream getAsciiStream(int columnIndex) throws SQLException {
-        return resultSet.getAsciiStream(columnIndex);
-    }
-
-    public InputStream getAsciiStream(String columnName) throws SQLException {
-        return resultSet.getAsciiStream(columnName);
-    }
-
-    public BigDecimal getBigDecimal(int columnIndex) throws SQLException {
-        return resultSet.getBigDecimal(columnIndex);
-    }
-
-    public BigDecimal getBigDecimal(String columnName) throws SQLException {
-        return resultSet.getBigDecimal(columnName);
-    }
-
-    public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
-        return resultSet.getBigDecimal(columnIndex, scale);
-    }
-
-    public BigDecimal getBigDecimal(String columnName, int scale) throws SQLException {
-        return resultSet.getBigDecimal(columnName, scale);
-    }
-
-    public InputStream getBinaryStream(int columnIndex) throws SQLException {
-        return resultSet.getBinaryStream(columnIndex);
-    }
-
-    public InputStream getBinaryStream(String columnName) throws SQLException {
-        return resultSet.getBinaryStream(columnName);
-    }
-
-    public Blob getBlob(int i) throws SQLException {
-        return resultSet.getBlob(i);
-    }
-
-    public Blob getBlob(String colName) throws SQLException {
-        return resultSet.getBlob(colName);
-    }
-
-    public boolean getBoolean(int columnIndex) throws SQLException {
-        return resultSet.getBoolean(columnIndex);
-    }
-
-    public boolean getBoolean(String columnName) throws SQLException {
-        return resultSet.getBoolean(columnName);
-    }
-
-    public byte getByte(int columnIndex) throws SQLException {
-        return resultSet.getByte(columnIndex);
-    }
-
-    public byte getByte(String columnName) throws SQLException {
-        return resultSet.getByte(columnName);
-    }
-
-    public byte[] getBytes(int columnIndex) throws SQLException {
-        return resultSet.getBytes(columnIndex);
-    }
-
-    public byte[] getBytes(String columnName) throws SQLException {
-        return resultSet.getBytes(columnName);
-    }
-
-    public Reader getCharacterStream(int columnIndex) throws SQLException {
-        return resultSet.getCharacterStream(columnIndex);
-    }
-
-    public Reader getCharacterStream(String columnName) throws SQLException {
-        return resultSet.getCharacterStream(columnName);
-    }
-
-    public Clob getClob(int i) throws SQLException {
-        return resultSet.getClob(i);
-    }
-
-    public Clob getClob(String colName) throws SQLException {
-        return resultSet.getClob(colName);
-    }
-
-    public int getConcurrency() throws SQLException {
-        return resultSet.getConcurrency();
-    }
-
-    public String getCursorName() throws SQLException {
-        return resultSet.getCursorName();
-    }
-
-    public Date getDate(int columnIndex) throws SQLException {
-        return resultSet.getDate(columnIndex);
-    }
-
-    public Date getDate(String columnName) throws SQLException {
-        return resultSet.getDate(columnName);
-    }
-
-    public Date getDate(int columnIndex, Calendar cal) throws SQLException {
-        return resultSet.getDate(columnIndex, cal);
-    }
-
-    public Date getDate(String columnName, Calendar cal) throws SQLException {
-        return resultSet.getDate(columnName, cal);
-    }
-
-    public double getDouble(int columnIndex) throws SQLException {
-        return resultSet.getDouble(columnIndex);
-    }
-
-    public double getDouble(String columnName) throws SQLException {
-        return resultSet.getDouble(columnName);
-    }
-
-    public int getFetchDirection() throws SQLException {
-        return resultSet.getFetchDirection();
-    }
-
-    public int getFetchSize() throws SQLException {
-        return resultSet.getFetchSize();
-    }
-
-    public float getFloat(int columnIndex) throws SQLException {
-        return resultSet.getFloat(columnIndex);
-    }
-
-    public float getFloat(String columnName) throws SQLException {
-        return resultSet.getFloat(columnName);
-    }
-
-    public int getInt(int columnIndex) throws SQLException {
-        return resultSet.getInt(columnIndex);
-    }
-
-    public int getInt(String columnName) throws SQLException {
-        return resultSet.getInt(columnName);
-    }
-
-    public long getLong(int columnIndex) throws SQLException {
-        return resultSet.getLong(columnIndex);
-    }
-
-    public long getLong(String columnName) throws SQLException {
-        return resultSet.getLong(columnName);
-    }
-
-    public ResultSetMetaData getMetaData() throws SQLException {
-        return resultSet.getMetaData();
-    }
-
-    public Object getObject(int columnIndex) throws SQLException {
-        return resultSet.getObject(columnIndex);
-    }
-
-    public Object getObject(String columnName) throws SQLException {
-        return resultSet.getObject(columnName);
-    }
-
-    public Object getObject(int arg0, Map arg1) throws SQLException {
-        return resultSet.getObject(arg0, arg1);
-    }
-
-    public Object getObject(String arg0, Map arg1) throws SQLException {
-        return resultSet.getObject(arg0, arg1);
-    }
-
-    public Ref getRef(int i) throws SQLException {
-        return resultSet.getRef(i);
-    }
-
-    public Ref getRef(String colName) throws SQLException {
-        return resultSet.getRef(colName);
-    }
-
-    public int getRow() throws SQLException {
-        return resultSet.getRow();
-    }
-
-    public short getShort(int columnIndex) throws SQLException {
-        return resultSet.getShort(columnIndex);
-    }
-
-    public short getShort(String columnName) throws SQLException {
-        return resultSet.getShort(columnName);
-    }
-
-    public Statement getStatement() throws SQLException {
-        return resultSet.getStatement();
-    }
-
-    public String getString(int columnIndex) throws SQLException {
-        return resultSet.getString(columnIndex);
-    }
-
-    public String getString(String columnName) throws SQLException {
-        return resultSet.getString(columnName);
-    }
-
-    public Time getTime(int columnIndex) throws SQLException {
-        return resultSet.getTime(columnIndex);
-    }
-
-    public Time getTime(String columnName) throws SQLException {
-        return resultSet.getTime(columnName);
-    }
-
-    public Time getTime(int columnIndex, Calendar cal) throws SQLException {
-        return resultSet.getTime(columnIndex, cal);
-    }
-
-    public Time getTime(String columnName, Calendar cal) throws SQLException {
-        return resultSet.getTime(columnName, cal);
-    }
-
-    public Timestamp getTimestamp(int columnIndex) throws SQLException {
-        return resultSet.getTimestamp(columnIndex);
-    }
-
-    public Timestamp getTimestamp(String columnName) throws SQLException {
-        return resultSet.getTimestamp(columnName);
-    }
-
-    public Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException {
-        return resultSet.getTimestamp(columnIndex, cal);
-    }
-
-    public Timestamp getTimestamp(String columnName, Calendar cal) throws SQLException {
-        return resultSet.getTimestamp(columnName, cal);
-    }
-
-    public int getType() throws SQLException {
-        return resultSet.getType();
-    }
-
-    public URL getURL(int columnIndex) throws SQLException {
-        return resultSet.getURL(columnIndex);
-    }
-
-    public URL getURL(String columnName) throws SQLException {
-        return resultSet.getURL(columnName);
-    }
-
-    public InputStream getUnicodeStream(int columnIndex) throws SQLException {
-        return resultSet.getUnicodeStream(columnIndex);
-    }
-
-    public InputStream getUnicodeStream(String columnName) throws SQLException {
-        return resultSet.getUnicodeStream(columnName);
-    }
-
-    public SQLWarning getWarnings() throws SQLException {
-        return resultSet.getWarnings();
-    }
-
-    public void insertRow() throws SQLException {
-        resultSet.insertRow();
-    }
-
-    public boolean isAfterLast() throws SQLException {
-        return resultSet.isAfterLast();
-    }
-
-    public boolean isBeforeFirst() throws SQLException {
-        return resultSet.isBeforeFirst();
-    }
-
-    public boolean isFirst() throws SQLException {
-        return resultSet.isFirst();
-    }
-
-    public boolean isLast() throws SQLException {
-        return resultSet.isLast();
-    }
-
-    public boolean last() throws SQLException {
-        return resultSet.last();
-    }
-
-    public void moveToCurrentRow() throws SQLException {
-        resultSet.moveToCurrentRow();
-    }
-
-    public void moveToInsertRow() throws SQLException {
-        resultSet.moveToInsertRow();
-    }
-
-    public boolean next() throws SQLException {
-        return resultSet.next();
-    }
-
-    public boolean previous() throws SQLException {
-        return resultSet.previous();
-    }
-
-    public void refreshRow() throws SQLException {
-        resultSet.refreshRow();
-    }
-
-    public boolean relative(int rows) throws SQLException {
-        return resultSet.relative(rows);
-    }
-
-    public boolean rowDeleted() throws SQLException {
-        return resultSet.rowDeleted();
-    }
-
-    public boolean rowInserted() throws SQLException {
-        return resultSet.rowInserted();
-    }
-
-    public boolean rowUpdated() throws SQLException {
-        return resultSet.rowUpdated();
-    }
-
-    public void setFetchDirection(int direction) throws SQLException {
-        resultSet.setFetchDirection(direction);
-    }
-
-    public void setFetchSize(int rows) throws SQLException {
-        resultSet.setFetchSize(rows);
-    }
-
-    public void updateArray(int columnIndex, Array x) throws SQLException {
-        resultSet.updateArray(columnIndex, x);
-    }
-
-    public void updateArray(String columnName, Array x) throws SQLException {
-        resultSet.updateArray(columnName, x);
-    }
-
-    public void updateAsciiStream(int columnIndex, InputStream x, int length) throws SQLException {
-        resultSet.updateAsciiStream(columnIndex, x, length);
-    }
-
-    public void updateAsciiStream(String columnName, InputStream x, int length) throws SQLException {
-        resultSet.updateAsciiStream(columnName, x, length);
-    }
-
-    public void updateBigDecimal(int columnIndex, BigDecimal x) throws SQLException {
-        resultSet.updateBigDecimal(columnIndex, x);
-    }
-
-    public void updateBigDecimal(String columnName, BigDecimal x) throws SQLException {
-        resultSet.updateBigDecimal(columnName, x);
-    }
-
-    public void updateBinaryStream(int columnIndex, InputStream x, int length) throws SQLException {
-        resultSet.updateBinaryStream(columnIndex, x, length);
-    }
-
-    public void updateBinaryStream(String columnName, InputStream x, int length) throws SQLException {
-        resultSet.updateBinaryStream(columnName, x, length);
-    }
-
-    public void updateBlob(int columnIndex, Blob x) throws SQLException {
-        resultSet.updateBlob(columnIndex, x);
-    }
-
-    public void updateBlob(String columnName, Blob x) throws SQLException {
-        resultSet.updateBlob(columnName, x);
-    }
-
-    public void updateBoolean(int columnIndex, boolean x) throws SQLException {
-        resultSet.updateBoolean(columnIndex, x);
-    }
-
-    public void updateBoolean(String columnName, boolean x) throws SQLException {
-        resultSet.updateBoolean(columnName, x);
-    }
-
-    public void updateByte(int columnIndex, byte x) throws SQLException {
-        resultSet.updateByte(columnIndex, x);
-    }
-
-    public void updateByte(String columnName, byte x) throws SQLException {
-        resultSet.updateByte(columnName, x);
-    }
-
-    public void updateBytes(int columnIndex, byte[] x) throws SQLException {
-        resultSet.updateBytes(columnIndex, x);
-    }
-
-    public void updateBytes(String columnName, byte[] x) throws SQLException {
-        resultSet.updateBytes(columnName, x);
-    }
-
-    public void updateCharacterStream(int columnIndex, Reader x, int length) throws SQLException {
-        resultSet.updateCharacterStream(columnIndex, x, length);
-    }
-
-    public void updateCharacterStream(String columnName, Reader reader, int length) throws SQLException {
-        resultSet.updateCharacterStream(columnName, reader, length);
-    }
-
-    public void updateClob(int columnIndex, Clob x) throws SQLException {
-        resultSet.updateClob(columnIndex, x);
-    }
-
-    public void updateClob(String columnName, Clob x) throws SQLException {
-        resultSet.updateClob(columnName, x);
-    }
-
-    public void updateDate(int columnIndex, Date x) throws SQLException {
-        resultSet.updateDate(columnIndex, x);
-    }
-
-    public void updateDate(String columnName, Date x) throws SQLException {
-        resultSet.updateDate(columnName, x);
-    }
-
-    public void updateDouble(int columnIndex, double x) throws SQLException {
-        resultSet.updateDouble(columnIndex, x);
-    }
-
-    public void updateDouble(String columnName, double x) throws SQLException {
-        resultSet.updateDouble(columnName, x);
-    }
-
-    public void updateFloat(int columnIndex, float x) throws SQLException {
-        resultSet.updateFloat(columnIndex, x);
-    }
-
-    public void updateFloat(String columnName, float x) throws SQLException {
-        resultSet.updateFloat(columnName, x);
-    }
-
-    public void updateInt(int columnIndex, int x) throws SQLException {
-        resultSet.updateInt(columnIndex, x);
-    }
-
-    public void updateInt(String columnName, int x) throws SQLException {
-        resultSet.updateInt(columnName, x);
-    }
-
-    public void updateLong(int columnIndex, long x) throws SQLException {
-        resultSet.updateLong(columnIndex, x);
-    }
-
-    public void updateLong(String columnName, long x) throws SQLException {
-        resultSet.updateLong(columnName, x);
-    }
-
-    public void updateNull(int columnIndex) throws SQLException {
-        resultSet.updateNull(columnIndex);
-    }
-
-    public void updateNull(String columnName) throws SQLException {
-        resultSet.updateNull(columnName);
-    }
-
-    public void updateObject(int columnIndex, Object x) throws SQLException {
-        resultSet.updateObject(columnIndex, x);
-    }
-
-    public void updateObject(String columnName, Object x) throws SQLException {
-        resultSet.updateObject(columnName, x);
-    }
-
-    public void updateObject(int columnIndex, Object x, int scale) throws SQLException {
-        resultSet.updateObject(columnIndex, x, scale);
-    }
-
-    public void updateObject(String columnName, Object x, int scale) throws SQLException {
-        resultSet.updateObject(columnName, x, scale);
-    }
-
-    public void updateRef(int columnIndex, Ref x) throws SQLException {
-        resultSet.updateRef(columnIndex, x);
-    }
-
-    public void updateRef(String columnName, Ref x) throws SQLException {
-        resultSet.updateRef(columnName, x);
-    }
-
-    public void updateRow() throws SQLException {
-        resultSet.updateRow();
-    }
-
-    public void updateShort(int columnIndex, short x) throws SQLException {
-        resultSet.updateShort(columnIndex, x);
-    }
-
-    public void updateShort(String columnName, short x) throws SQLException {
-        resultSet.updateShort(columnName, x);
-    }
-
-    public void updateString(int columnIndex, String x) throws SQLException {
-        resultSet.updateString(columnIndex, x);
-    }
-
-    public void updateString(String columnName, String x) throws SQLException {
-        resultSet.updateString(columnName, x);
-    }
-
-    public void updateTime(int columnIndex, Time x) throws SQLException {
-        resultSet.updateTime(columnIndex, x);
-    }
-
-    public void updateTime(String columnName, Time x) throws SQLException {
-        resultSet.updateTime(columnName, x);
-    }
-
-    public void updateTimestamp(int columnIndex, Timestamp x) throws SQLException {
-        resultSet.updateTimestamp(columnIndex, x);
-    }
-
-    public void updateTimestamp(String columnName, Timestamp x) throws SQLException {
-        resultSet.updateTimestamp(columnName, x);
-    }
-
-    public boolean wasNull() throws SQLException {
-        return resultSet.wasNull();
+    /**
+     * {@inheritDoc}
+     */
+    public Object invoke(Object proxy, Method m, Object[] args) throws Throwable {
+        if ("close".equals(m.getName())) {
+            DbUtility.close(connection, statement, resultSet);
+            return null;
+        } else {
+            return m.invoke(resultSet, args);
+        }
     }
 }