From: Jeroen Frijters <jeroen@frijters.net>
Date: Thu, 18 Sep 2003 06:11:41 +0000 (+0000)
Subject: 2003-09-18  Jeroen Frijters  <jeroen@frijters.net>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fc08ad2815be2faea9c12ae978c39bc3e811af15;p=gcc.git

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 35403cfab1b..0ba824b0a29 100644
--- 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 b5f0523dfd9..be0aa4dcd02 100644
--- 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);