Connector/J commit: r6744 - in branches/branch_5_1: . src/com/mysql/jdbc

[mmatthews]

Modified:
   branches/branch_5_1/CHANGES
   branches/branch_5_1/src/com/mysql/jdbc/ResultSetImpl.java
Log:
Fixed BUG#33162 - NullPointerException instead of SQLException 
      thrown for ResultSet.getTimestamp() when not positioned on a
      row. 

Modified: branches/branch_5_1/CHANGES
===================================================================
--- branches/branch_5_1/CHANGES	2008-02-27 14:58:58 UTC (rev 6743)
+++ branches/branch_5_1/CHANGES	2008-02-27 15:06:43 UTC (rev 6744)
@@ -146,6 +146,10 @@
     - Fixed BUG#34194 - ResultSetMetaData.getColumnTypeName() returns
       "UNKNOWN" for GEOMETRY type.
       
+    - Fixed BUG#33162 - NullPointerException instead of SQLException 
+      thrown for ResultSet.getTimestamp() when not positioned on a
+      row. 
+      
 10-09-07 - Version 5.1.5
 
     - Released instead of 5.1.4 to pickup patch for BUG#31053

Modified: branches/branch_5_1/src/com/mysql/jdbc/ResultSetImpl.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/ResultSetImpl.java	2008-02-27 14:58:58 UTC (rev
6743)
+++ branches/branch_5_1/src/com/mysql/jdbc/ResultSetImpl.java	2008-02-27 15:06:43 UTC (rev
6744)
@@ -6625,6 +6625,7 @@
 					rollForward);
 		} else {
 			checkClosed();
+			checkRowPos();
 			checkColumnBounds(columnIndex);
 			
 			tsVal = this.thisRow.getTimestampFast(columnIndex - 1,