This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to annotated tag REL9_3_1102 in repository libpostgresql-jdbc-java.
commit 23fe2bba11f71cc5c459cb19b9d2679b2f17f599 Author: Dave Cramer <[email protected]> Date: Tue Jan 28 09:14:41 2014 -0500 fixed compile error for 1.5 --- org/postgresql/jdbc2/AbstractJdbc2ResultSet.java | 10 +++++++++- org/postgresql/jdbc2/AbstractJdbc2Statement.java | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java b/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java index edbfdb1..b847694 100644 --- a/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java +++ b/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java @@ -2838,7 +2838,15 @@ public abstract class AbstractJdbc2ResultSet implements BaseResultSet, org.postg if (rows == null) throw new PSQLException(GT.tr("This ResultSet is closed."), PSQLState.OBJECT_NOT_IN_STATE); } - + + /* + * for jdbc3 to call internally + */ + protected boolean isResultSetClosed() + { + return rows==null; + } + protected void checkColumnIndex(int column) throws SQLException { if ( column < 1 || column > fields.length ) diff --git a/org/postgresql/jdbc2/AbstractJdbc2Statement.java b/org/postgresql/jdbc2/AbstractJdbc2Statement.java index 13630b2..7ca3c4f 100644 --- a/org/postgresql/jdbc2/AbstractJdbc2Statement.java +++ b/org/postgresql/jdbc2/AbstractJdbc2Statement.java @@ -2979,7 +2979,7 @@ public abstract class AbstractJdbc2Statement implements BaseStatement checkClosed(); ResultSet rs = getResultSet(); - if (rs == null || rs.isClosed() ) { + if (rs == null || ((AbstractJdbc2ResultSet)rs).isResultSetClosed() ) { // OK, we haven't executed it yet, or it was closed // we've got to go to the backend // for more info. We send the full query, but just don't -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpostgresql-jdbc-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
