From 8bb61fb95337941507285642dca81c418b1e4c3c Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Wed, 12 May 1999 11:01:31 -0700 Subject: [PATCH] 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 --- libjava/java/util/Calendar.java | 1 + libjava/java/util/natGregorianCalendar.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libjava/java/util/Calendar.java b/libjava/java/util/Calendar.java index f4806a35bdc2..bd022a7a54c7 100644 --- 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 cfa98bdc58d4..5f1374e79ce5 100644 --- 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; }