2003-04-11 Dalibor Topic <robilad@yahoo.com>

	* java/sql/Date.java: imported java.text.ParseException.
	(getHours, getMinutes, getSeconds, setHours, setMinutes,
	setSeconds) new methods.
	* java/sql/Time.java:
	(getDate, getDay, getMonts, getYear, setDate, setMonth, setYear):
	new methods.
	* java/sql/Date.java, java/sql/Time.java,
         java/sql/Timestamp.java: imported java.text.ParseException.
	(valueOf) throw an IllegalArgumentException if argument can't
	be parsed.
       * java/sql/DriverManager.java
       (getDriver) throw an SQLException if no driver can be found.

       All reported by: Ito Kazumitsu <ito.kazumitsu@hitachi-cable.co.jp>

1 files changed, 10 insertions, 3 deletions

diff --git a/java/sql/Timestamp.java b/java/sql/Timestamp.java
index 0f8b44c43..6177b5b17 100644
--- a/java/sql/Timestamp.java
+++ b/java/sql/Timestamp.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 
 package java.sql;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 
 /**
@@ -81,11 +82,17 @@ public class Timestamp extends java.util.Date
     try
       {
 	Date d = (Date) parse_sdf.parseObject(str);
-	return new Timestamp(d.getTime());
+
+	if (d == null) {
+	  throw new IllegalArgumentException(str);
+	}
+	else {
+	  return new Timestamp(d.getTime());
+	}
       }
-    catch (Exception e)
+    catch (ParseException e)
       {
-	return null;
+	throw new IllegalArgumentException(str);
       }
   }