Back ported patches from head to 7.3 branch (fixes for NPE in result set absolute...

 Modified Files:
  Tag: REL7_3_STABLE
 	jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java
 	jdbc/org/postgresql/util/PSQLException.java

diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java b/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java
index a4794ba22c28e6e791a5c78d6ae4587058a498cf..ce0d7dd968e16e610a64c70294b377761518cab4 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java
+++ b/src/interfaces/jdbc/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/src/interfaces/jdbc/org/postgresql/util/PSQLException.java b/src/interfaces/jdbc/org/postgresql/util/PSQLException.java
index 46c71fab11fb1750968c77d873f0086113d0a93a..309306bb26a856eedb02ae58debf46b56bdb3644 100644 (file)
--- a/src/interfaces/jdbc/org/postgresql/util/PSQLException.java
+++ b/src/interfaces/jdbc/org/postgresql/util/PSQLException.java
@@ -111,6 +111,6 @@ public class PSQLException extends SQLException
         */
        public String toString()
        {
-               return message;
+               return message != null ? message : "";
        }
 }