stevencaswell 2003/01/26 08:50:44 Modified: dbutils/src/java/org/apache/commons/dbutils/driver ResultSetWrapper.java Log: - added additional constructor to allow only a ResultSet to be specified - added logic to getStatement to delegate to the wrapped result set's getStatement if there was no statement specified during construction Revision Changes Path 1.4 +16 -1 jakarta-commons-sandbox/dbutils/src/java/org/apache/commons/dbutils/driver/ResultSetWrapper.java Index: ResultSetWrapper.java =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/dbutils/src/java/org/apache/commons/dbutils/driver/ResultSetWrapper.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ResultSetWrapper.java 17 Dec 2002 06:41:33 -0000 1.3 +++ ResultSetWrapper.java 26 Jan 2003 16:50:44 -0000 1.4 @@ -27,7 +27,17 @@ private ResultSet rs; private Statement stat; + public ResultSetWrapper(ResultSet rs) { + if(rs == null) { + throw new IllegalArgumentException("ResultSet argument cannot be null"); + } + this.rs = rs; + } + public ResultSetWrapper(ResultSet rs, Statement stat) { + if(rs == null) { + throw new IllegalArgumentException("ResultSet argument cannot be null"); + } this.rs = rs; this.stat = stat; } @@ -493,7 +503,12 @@ } public Statement getStatement() throws SQLException { - return stat; + if(stat != null) { + return stat; + } + else { + return rs.getStatement(); + } } public Object getObject(int idx, Map map) throws SQLException {
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>