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

[Kaffe CVS]

PatchSet 5569 
Date: 2005/02/19 16:48:54
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: calendar fix

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

Resynced with GNU Classpath.

2005-02-17  Sven de Marothy  <sven at physto.se>

* java/util/GregorianCalendar.java,
(add): Don't set fields directly anymore. Use set()

Members: 
	ChangeLog:1.3613->1.3614 
	libraries/javalib/java/util/GregorianCalendar.java:1.36->1.37 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3613 kaffe/ChangeLog:1.3614
--- kaffe/ChangeLog:1.3613	Sat Feb 19 16:24:46 2005
+++ kaffe/ChangeLog	Sat Feb 19 16:48:54 2005
@@ -1,6 +1,15 @@
 2005-02-19  Dalibor Topic  <robilad at kaffe.org>
 
-	Resynced with GNU inetlib.
+	Resynced with GNU Classpath.
+	
+	2005-02-17  Sven de Marothy  <sven at physto.se>
+
+	* java/util/GregorianCalendar.java,
+	(add): Don't set fields directly anymore. Use set()
+	
+2005-02-19  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
 	
 	2005-02-17  Ito Kazumitsu  <kaz at maczuka.gcd.org>
 
Index: kaffe/libraries/javalib/java/util/GregorianCalendar.java
diff -u kaffe/libraries/javalib/java/util/GregorianCalendar.java:1.36 kaffe/libraries/javalib/java/util/GregorianCalendar.java:1.37
--- kaffe/libraries/javalib/java/util/GregorianCalendar.java:1.36	Mon Feb 14 21:36:06 2005
+++ kaffe/libraries/javalib/java/util/GregorianCalendar.java	Sat Feb 19 16:48:57 2005
@@ -923,13 +923,13 @@
 	    fields[MONTH] += 12;
 	    fields[YEAR]--;
 	  }
-	isTimeSet = false;
 	int maxDay = getActualMaximum(DAY_OF_MONTH);
 	if (fields[DAY_OF_MONTH] > maxDay)
 	  {
 	    fields[DAY_OF_MONTH] = maxDay;
-	    isTimeSet = false;
 	  }
+	set(YEAR, fields[YEAR]);
+	set(MONTH, fields[MONTH]);
 	break;
       case DAY_OF_MONTH:
       case DAY_OF_YEAR: