[libpostgresql-jdbc-java] 08/22: Back ported patches from head to 7.3 branch (fixes for NPE in result set absolute() and NPE when logging enabled) Modified Files: Tag: REL7_3_STABLE jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java jdbc/org/postgresql/util/PSQLException.java

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to tag REL7_3_4
in repository libpostgresql-jdbc-java.

commit 93c0bea501706b8b4b2ef5a33f9ed33213192f0b
Author: Barry Lind <barry at xythos.com>
Date:   Sat Mar 8 06:09:37 2003 +0000

    Back ported patches from head to 7.3 branch (fixes for NPE in result set absolute() and NPE when logging enabled)
     Modified Files:
      Tag: REL7_3_STABLE
     	jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java
     	jdbc/org/postgresql/util/PSQLException.java
---
 org/postgresql/jdbc2/AbstractJdbc2ResultSet.java | 4 ++++
 org/postgresql/util/PSQLException.java           | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java b/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java
index a4794ba..ce0d7dd 100644
--- a/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java
+++ b/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java
@@ -188,6 +188,10 @@ public abstract class AbstractJdbc2ResultSet extends org.postgresql.jdbc1.Abstra
 
 		current_row = internalIndex;
 		this_row = (byte[][]) rows.elementAt(internalIndex);
+
+		rowBuffer = new byte[this_row.length][];
+		System.arraycopy(this_row, 0, rowBuffer, 0, this_row.length);
+
 		return true;
 	}
 
diff --git a/org/postgresql/util/PSQLException.java b/org/postgresql/util/PSQLException.java
index 46c71fa..309306b 100644
--- a/org/postgresql/util/PSQLException.java
+++ b/org/postgresql/util/PSQLException.java
@@ -111,6 +111,6 @@ public class PSQLException extends SQLException
 	 */
 	public String toString()
 	{
-		return message;
+		return message != null ? message : "";
 	}
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpostgresql-jdbc-java.git