Connector/J commit: r6695 - branches/branch_5_1/src/com/mysql/jdbc

[mmatthews]

Modified:
   branches/branch_5_1/src/com/mysql/jdbc/ResultSetImpl.java
   branches/branch_5_1/src/com/mysql/jdbc/ResultSetRow.java
   branches/branch_5_1/src/com/mysql/jdbc/TimeUtil.java
Log:
Remove negation of legacy date code flag. Fixed an NPE.

Modified: branches/branch_5_1/src/com/mysql/jdbc/ResultSetImpl.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/ResultSetImpl.java	2007-12-12 19:23:30 UTC (rev 6694)
+++ branches/branch_5_1/src/com/mysql/jdbc/ResultSetImpl.java	2007-12-12 19:24:30 UTC (rev 6695)
@@ -416,7 +416,7 @@
 			this.serverTimeZoneTz = this.connection.getServerTimezoneTZ();
 		}
 		
-		useLegacyDatetimeCode = !this.connection.getUseLegacyDatetimeCode();
+		useLegacyDatetimeCode = this.connection.getUseLegacyDatetimeCode();
 	}
 
 	/**
@@ -488,7 +488,7 @@
 		if (this.fields != null) {
 			initializeWithMetadata();
 		} // else called by Connection.initializeResultsMetadataFromCache() when cached
-		useLegacyDatetimeCode = !this.connection.getUseLegacyDatetimeCode();
+		useLegacyDatetimeCode = this.connection.getUseLegacyDatetimeCode();
 	}
 
 	public void initializeWithMetadata() throws SQLException {
@@ -1002,7 +1002,7 @@
 		boolean useGmtMillis = this.connection.getUseGmtMillisForDatetimes();
 		
 		return TimeUtil.fastDateCreate(useGmtMillis,
-				useGmtMillis ? getGmtCalendar() : null,
+				useGmtMillis ? getGmtCalendar() : cal,
 				cal, year, month, day);
 	}
 
@@ -2322,10 +2322,14 @@
 		} catch (SQLException sqlEx) {
 			throw sqlEx; // don't re-wrap
 		} catch (Exception e) {
-			throw SQLError.createSQLException(Messages.getString(
+			SQLException sqlEx = SQLError.createSQLException(Messages.getString(
 					"ResultSet.Bad_format_for_Date", new Object[] { stringVal,
 							Constants.integerValueOf(columnIndex) }),
 					SQLError.SQL_STATE_ILLEGAL_ARGUMENT); //$NON-NLS-1$
+			
+			sqlEx.initCause(e);
+			
+			throw sqlEx;
 		}
 	}
 	

Modified: branches/branch_5_1/src/com/mysql/jdbc/ResultSetRow.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/ResultSetRow.java	2007-12-12 19:23:30 UTC (rev 6694)
+++ branches/branch_5_1/src/com/mysql/jdbc/ResultSetRow.java	2007-12-12 19:24:30 UTC (rev 6695)
@@ -287,11 +287,14 @@
 		} catch (SQLException sqlEx) {
 			throw sqlEx; // don't re-wrap
 		} catch (Exception e) {
-			throw SQLError.createSQLException(Messages.getString(
+			SQLException sqlEx = SQLError.createSQLException(Messages.getString(
 					"ResultSet.Bad_format_for_Date", new Object[] {
 							new String(dateAsBytes),
 							Constants.integerValueOf(columnIndex + 1) }),
 					SQLError.SQL_STATE_ILLEGAL_ARGUMENT); //$NON-NLS-1$
+			sqlEx.initCause(e);
+			
+			throw sqlEx;
 		}
 	}
 

Modified: branches/branch_5_1/src/com/mysql/jdbc/TimeUtil.java
===================================================================
--- branches/branch_5_1/src/com/mysql/jdbc/TimeUtil.java	2007-12-12 19:23:30 UTC (rev 6694)
+++ branches/branch_5_1/src/com/mysql/jdbc/TimeUtil.java	2007-12-12 19:24:30 UTC (rev 6695)
@@ -1141,7 +1141,7 @@
 	final static Timestamp fastTimestampCreate(TimeZone tz, int year,
  			int month, int day, int hour, int minute, int seconds,
  			int secondsPart) {
-		Calendar cal = new GregorianCalendar(tz);
+		Calendar cal = (tz == null) ? new GregorianCalendar() : new GregorianCalendar(tz);
 		cal.clear();
 		
 		// why-oh-why is this different than java.util.date,