[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: fix for SimpleTimeZone

[Kaffe CVS]

PatchSet 5815 
Date: 2005/01/07 19:04:30
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: fix for SimpleTimeZone

2005-01-07  Dalibor Topic  <robilad at kaffe.org>

Resynced with GNU Classpath.

2005-01-07  Andrew John Hughes  <gnu_andrew at member.fsf.org>

* java/util/SimpleTimeZone.java:
(getOffset): offset end date with daylight savings

Members: 
	ChangeLog:1.3359->1.3360 
	libraries/javalib/java/util/SimpleTimeZone.java:1.18->1.19 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3359 kaffe/ChangeLog:1.3360
--- kaffe/ChangeLog:1.3359	Fri Jan  7 18:59:36 2005
+++ kaffe/ChangeLog	Fri Jan  7 19:04:30 2005
@@ -2,6 +2,15 @@
 
 	Resynced with GNU Classpath.
 
+	2005-01-07  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* java/util/SimpleTimeZone.java:
+	(getOffset): offset end date with daylight savings
+	
+2005-01-07  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2005-01-06  Tom Tromey  <tromey at redhat.com>
 
 	* java/lang/ClassLoader.java (findClass): Fixed documentation.
Index: kaffe/libraries/javalib/java/util/SimpleTimeZone.java
diff -u kaffe/libraries/javalib/java/util/SimpleTimeZone.java:1.18 kaffe/libraries/javalib/java/util/SimpleTimeZone.java:1.19
--- kaffe/libraries/javalib/java/util/SimpleTimeZone.java:1.18	Mon Jul 26 21:13:59 2004
+++ kaffe/libraries/javalib/java/util/SimpleTimeZone.java	Fri Jan  7 19:04:32 2005
@@ -70,7 +70,7 @@
   /**
    * The daylight savings offset.  This is a positive offset in
    * milliseconds with respect to standard time.  Typically this
-   * is one hour, but for some time zones this may be half an our.
+   * is one hour, but for some time zones this may be half an hour.
    * @serial
    * @since JDK1.1.4
    */
@@ -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);