Calendar.java (set): First call computeFields if needed.

x
	* java/util/Calendar.java (set):  First call computeFields if needed.
	* java/util/natGregorianCalendar.cc (computeTime):  Cast 1000 to jlong.

From-SVN: r26910

diff --git a/libjava/java/util/Calendar.java b/libjava/java/util/Calendar.java
index f4806a35bdc2e1335244d615eb7cd45b8588567e..bd022a7a54c7cb902fd4f38e9f7822aea3ce1bc1 100644 (file)
--- a/libjava/java/util/Calendar.java
+++ b/libjava/java/util/Calendar.java
@@ -187,6 +187,7 @@ public abstract class Calendar implements java.io.Serializable, Cloneable
 
   public final void set (int fld, int value)
   {
+    if (! areFieldsSet) computeFields();
     fields[fld] = value;
     isTimeSet = false;
   }

diff --git a/libjava/java/util/natGregorianCalendar.cc b/libjava/java/util/natGregorianCalendar.cc
index cfa98bdc58d4959a11506c65e3055e394e305118..5f1374e79ce5471a4411cc4685dc007fa4fb6ded 100644 (file)
--- a/libjava/java/util/natGregorianCalendar.cc
+++ b/libjava/java/util/natGregorianCalendar.cc
@@ -57,7 +57,7 @@ java::util::GregorianCalendar::computeTime ()
   t += zone->getRawOffset();
 
   // Adjust for milliseconds.
-  time = t * 1000 + elements(fields)[MILLISECOND];
+  time = t * (jlong) 1000 + elements(fields)[MILLISECOND];
 
   isTimeSet = true;
 }