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

Kaffe CVS cvs-commits at kaffe.org
Sat Jan 8 14:04:38 PST 2005


PatchSet 5821 
Date: 2005/01/08 21:59:24
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: SimpleTimeZone fix

Members: 
	ChangeLog:1.3365->1.3366 
	libraries/javalib/java/util/SimpleTimeZone.java:1.19->1.20 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3365 kaffe/ChangeLog:1.3366
--- kaffe/ChangeLog:1.3365	Sat Jan  8 21:54:48 2005
+++ kaffe/ChangeLog	Sat Jan  8 21:59:24 2005
@@ -4,6 +4,15 @@
 	
 	2005-01-08  Michael Koch  <konqueror at gmx.de>
 
+	* java/util/SimpleTimeZone.java (checkRule):
+	Throw IllegalArgumentException on invalid month values.
+
+2005-01-08  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+	
+	2005-01-08  Michael Koch  <konqueror at gmx.de>
+
 	* gnu/java/net/protocol/http/HTTPConnection.java
 	(newRequest): Use "/" as path if no path given in URL.
 
Index: kaffe/libraries/javalib/java/util/SimpleTimeZone.java
diff -u kaffe/libraries/javalib/java/util/SimpleTimeZone.java:1.19 kaffe/libraries/javalib/java/util/SimpleTimeZone.java:1.20
--- kaffe/libraries/javalib/java/util/SimpleTimeZone.java:1.19	Fri Jan  7 19:04:32 2005
+++ kaffe/libraries/javalib/java/util/SimpleTimeZone.java	Sat Jan  8 21:59:25 2005
@@ -430,6 +430,8 @@
    */
   private int checkRule(int month, int day, int dayOfWeek)
   {
+    if (month < 0 || month > 11)
+      throw new IllegalArgumentException("month out of range");
     int daysInMonth = getDaysInMonth(month, 1);
     if (dayOfWeek == 0)
       {
@@ -590,7 +592,7 @@
    *
    * Note that this API isn't incredibly well specified.  It appears that the
    * after flag must override the parameters, since normally, the day and
-   * dayofweek can select this.  I.e., if day < 0 and dayOfWeek < 0, on or
+   * dayofweek can select this.  I.e., if day &lt; 0 and dayOfWeek &lt; 0, on or
    * before mode is chosen.  But if after == true, this implementation
    * overrides the signs of the other arguments.  And if dayOfWeek == 0, it
    * falls back to the behavior in the other APIs.  I guess this should be




More information about the kaffe mailing list