diff options
| author | Tom Tromey <tromey@redhat.com> | 2003-04-19 21:17:50 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2003-04-19 21:17:50 +0000 |
| commit | a8ada98685bc94b7bbde2865fd685464a18d160d (patch) | |
| tree | 4fc13305f425cea754f23403e6595e5a31598e3d /libjava/java/sql/Timestamp.java | |
| parent | de0656cf30b171cf5a05d2233e4aab26edc56105 (diff) | |
| download | gcc-a8ada98685bc94b7bbde2865fd685464a18d160d.zip gcc-a8ada98685bc94b7bbde2865fd685464a18d160d.tar.gz gcc-a8ada98685bc94b7bbde2865fd685464a18d160d.tar.bz2 | |
Date.java, [...]: New versions from Classpath.
* java/sql/Date.java, java/sql/DriverManager.java,
java/sql/Time.java, java/sql/Timestamp.java: New versions from
Classpath.
From-SVN: r65831
Diffstat (limited to 'libjava/java/sql/Timestamp.java')
| -rw-r--r-- | libjava/java/sql/Timestamp.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libjava/java/sql/Timestamp.java b/libjava/java/sql/Timestamp.java index 0f8b44c..b5f0523 100644 --- a/libjava/java/sql/Timestamp.java +++ b/libjava/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,15 @@ 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); } } |