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

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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@71508 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 35403cf..0ba824b 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 b5f0523..be0aa4d 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);