From 8413669bde530c1ea19e990945f3fd11f6226f63 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 9 Feb 2007 18:14:46 +0000 Subject: [PATCH] TimeZone.java: Handle default (one hour) daylight savings. 2007-02-09 Jakub Jelinek * java/util/TimeZone.java: Handle default (one hour) daylight savings. From-SVN: r121766 --- libjava/classpath/java/util/TimeZone.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libjava/classpath/java/util/TimeZone.java b/libjava/classpath/java/util/TimeZone.java index 4f25016c577..f349b031e95 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? -- 2.30.2