diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-02-09 18:14:46 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2007-02-09 18:14:46 +0000 |
| commit | 8413669bde530c1ea19e990945f3fd11f6226f63 (patch) | |
| tree | 0eae34593964e4a459980193f337178163caba06 /libjava/classpath/java | |
| parent | 87a8ec2bf7f8a81b54dfb56ef3c3141df42d2325 (diff) | |
| download | gcc-8413669bde530c1ea19e990945f3fd11f6226f63.zip gcc-8413669bde530c1ea19e990945f3fd11f6226f63.tar.gz gcc-8413669bde530c1ea19e990945f3fd11f6226f63.tar.bz2 | |
TimeZone.java: Handle default (one hour) daylight savings.
2007-02-09 Jakub Jelinek <jakub@redhat.com>
* java/util/TimeZone.java: Handle default (one hour) daylight
savings.
From-SVN: r121766
Diffstat (limited to 'libjava/classpath/java')
| -rw-r--r-- | libjava/classpath/java/util/TimeZone.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libjava/classpath/java/util/TimeZone.java b/libjava/classpath/java/util/TimeZone.java index 4f25016..f349b03 100644 --- a/libjava/classpath/java/util/TimeZone.java +++ b/libjava/classpath/java/util/TimeZone.java @@ -977,7 +977,14 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable if (index < idLength) index--; - { // convert the dst string to a millis number + if (index == prevIndex && (c == ',' || c == ';')) + { + // Missing dst offset defaults to one hour ahead of standard + // time. + dstOffs = stdOffs + 60 * 60 * 1000; + } + else + { // convert the dst string to a millis number String offset = sysTimeZoneId.substring(prevIndex, index); prevIndex = index; @@ -991,7 +998,7 @@ public abstract class TimeZone implements java.io.Serializable, Cloneable // TZ timezone offsets are positive when WEST of the meridian. dstOffs = -dstOffs; - } + } // Done yet? (Format: std offset dst offset) // FIXME: We don't support DST without a rule given. Should we? |