Update of Java driver from Peter Mount.

1 files changed, 5 insertions, 3 deletions

diff --git a/src/interfaces/jdbc/postgresql/ResultSetMetaData.java b/src/interfaces/jdbc/postgresql/ResultSetMetaData.java
index f058e2e0ba6..7d2c1ceaf33 100644
--- a/src/interfaces/jdbc/postgresql/ResultSetMetaData.java
+++ b/src/interfaces/jdbc/postgresql/ResultSetMetaData.java
@@ -190,9 +190,11 @@ public class ResultSetMetaData implements java.sql.ResultSetMetaData
     for (i = 0 ; i < rows.size(); ++i)
       {
 	byte[][] x = (byte[][])(rows.elementAt(i));
-	int xl = x[column - 1].length;
-	if (xl > max)
-	  max = xl;
+	if(x[column-1]!=null) {
+	  int xl = x[column - 1].length;
+	  if (xl > max)
+	    max = xl;
+	}
       }
     return max;
   }