diff options
| author | Jeroen Frijters <jeroen@frijters.net> | 2003-09-18 06:11:41 +0000 |
|---|---|---|
| committer | Michael Koch <mkoch@gcc.gnu.org> | 2003-09-18 06:11:41 +0000 |
| commit | fc08ad2815be2faea9c12ae978c39bc3e811af15 (patch) | |
| tree | e366fcbf250608233288d04b415ace3ef3dc2086 /libjava | |
| parent | f5e2e1adf010fb5a36d6c03ea95d453ea33a6d4a (diff) | |
| download | gcc-fc08ad2815be2faea9c12ae978c39bc3e811af15.zip gcc-fc08ad2815be2faea9c12ae978c39bc3e811af15.tar.gz gcc-fc08ad2815be2faea9c12ae978c39bc3e811af15.tar.bz2 | |
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/sql/Timestamp.java | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 35403cf..0ba824b 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 b5f0523..be0aa4d 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); |