[kaffe] CVS kaffe (robilad): Resync with GNU classpath: SimpleTimeZone fixlet

[Kaffe CVS]

PatchSet 5588 
Date: 2005/02/21 23:20:53
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resync with GNU classpath: SimpleTimeZone fixlet

2005-02-20  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-02-20  Mark Wielaard  <mark at klomp.org>

        * java/util/SimpleTimeZone.java (getOffset): Calculate beforeEnd by
        taking dstSavings into account.

Members: 
	ChangeLog:1.3632->1.3633 
	libraries/javalib/java/util/SimpleTimeZone.java:1.24->1.25 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3632 kaffe/ChangeLog:1.3633
--- kaffe/ChangeLog:1.3632	Mon Feb 21 23:12:41 2005
+++ kaffe/ChangeLog	Mon Feb 21 23:20:53 2005
@@ -2,6 +2,15 @@
 
 	Resynced with GNU Classpath.
 
+	2005-02-20  Mark Wielaard  <mark at klomp.org>
+
+        * java/util/SimpleTimeZone.java (getOffset): Calculate beforeEnd by
+        taking dstSavings into account.
+
+2005-02-20  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2005-02-20  Rutger Ovidius  <ovidr at users.sourceforge.net>
 
         * gnu/java/security/provider/Gnu.java (Gnu): Add SHA-160 alias.
Index: kaffe/libraries/javalib/java/util/SimpleTimeZone.java
diff -u kaffe/libraries/javalib/java/util/SimpleTimeZone.java:1.24 kaffe/libraries/javalib/java/util/SimpleTimeZone.java:1.25
--- kaffe/libraries/javalib/java/util/SimpleTimeZone.java:1.24	Sat Feb 19 16:55:29 2005
+++ kaffe/libraries/javalib/java/util/SimpleTimeZone.java	Mon Feb 21 23:20:56 2005
@@ -694,7 +694,8 @@
 	boolean afterStart = ! isBefore(year, month, day, dayOfWeek, millis,
 	                                startMode, startMonth, startDay,
 	                                startDayOfWeek, startTime);
-	boolean beforeEnd = isBefore(year, month, day, dayOfWeek, millis,
+	boolean beforeEnd = isBefore(year, month, day, dayOfWeek,
+				     millis + dstSavings,
 	                             endMode, endMonth, endDay, endDayOfWeek,
 	                             endTime);