fix for timestamp objects in simpletuple

RoanKanninga · Jul 31, 2012 · 339b162 · 339b162
1 parent 9fdcd13
commit 339b162
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/org/molgenis/util/SimpleTuple.java b/src/org/molgenis/util/SimpleTuple.java
@@ -459,6 +459,7 @@ public java.sql.Date getDate(int column) throws ParseException
 	{
 		if (this.getObject(column) == null || this.getString(column) == "") return null;
 		if (this.getObject(column) instanceof java.sql.Date) return (java.sql.Date) this.getObject(column);
+		if (this.getObject(column) instanceof java.sql.Timestamp) return (java.sql.Date) this.getObject(column);
 		if (this.getObject(column) instanceof java.util.Date) return new java.sql.Date(
 				((java.util.Date) this.getObject(column)).getTime());
 
@@ -495,6 +496,7 @@ public java.sql.Date getDate(String column) throws ParseException
 	{
 		if (this.getObject(column) == null || this.getString(column) == "") return null;
 		if (this.getObject(column) instanceof java.sql.Date) return (java.sql.Date) this.getObject(column);
+		if (this.getObject(column) instanceof java.sql.Timestamp) return (java.sql.Date) this.getObject(column);
 		if (this.getObject(column) instanceof java.util.Date) return new java.sql.Date(
 				((java.util.Date) this.getObject(column)).getTime());
 
@@ -577,6 +579,7 @@ public File getFile(int column)
 	public Timestamp getTimestamp(String column) throws ParseException
 	{
 		if (this.getObject(column) == null || this.getString(column) == "") return null;
+		if (this.getObject(column) instanceof java.sql.Timestamp) return (java.sql.Timestamp) this.getObject(column);
 		try
 		{
 			DateFormat formatter = new SimpleDateFormat(DATETIMEFORMAT, Locale.US);
@@ -620,6 +623,7 @@ public Timestamp getTimestamp(String column) throws ParseException
 	public Timestamp getTimestamp(int column) throws ParseException
 	{
 		if (this.getObject(column) == null || this.getString(column) == "") return null;
+		if (this.getObject(column) instanceof java.sql.Timestamp) return (java.sql.Timestamp) this.getObject(column);
 		try
 		{
 			DateFormat formatter = new SimpleDateFormat(DATETIMEFORMAT, Locale.US);