2003-09-18 Jeroen Frijters <jeroen@frijters.net>

	* java/sql/Timestamp.java
	(valueOf): Fixed confusion of java.sql.Date and java.util.Date

From-SVN: r71508

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 35403cfab1b717c86f9749a37eff51b2e1008537..0ba824b0a293ab11c50a7353d25956b55a21ced7 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-18  Jeroen Frijters  <jeroen@frijters.net>
+
+       * java/sql/Timestamp.java
+       (valueOf): Fixed confusion of java.sql.Date and java.util.Date
+
 2003-09-18  David P Grove  <groved@us.ibm.com>
 
        * java/io/LineNumberReader (read): Don't reset pos & limit when

diff --git a/libjava/java/sql/Timestamp.java b/libjava/java/sql/Timestamp.java
index b5f0523dfd931f72953242878be66be681740a24..be0aa4dcd022345408c408286433c68ea93a7707 100644 (file)
--- a/libjava/java/sql/Timestamp.java
+++ b/libjava/java/sql/Timestamp.java
@@ -81,7 +81,7 @@ public class Timestamp extends java.util.Date
   {
     try
       {
-       Date d = (Date) parse_sdf.parseObject(str);
+       java.util.Date d = (java.util.Date)parse_sdf.parseObject(str);
 
        if (d == null)
          throw new IllegalArgumentException(str);