From 8de1e33ce736fc8fc046089e4341a51b344566d3 Mon Sep 17 00:00:00 2001 From: bothner Date: Wed, 12 May 1999 18:01:31 +0000 Subject: x * java/util/Calendar.java (set): First call computeFields if needed. * java/util/natGregorianCalendar.cc (computeTime): Cast 1000 to jlong. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26910 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/java/util/Calendar.java | 1 + libjava/java/util/natGregorianCalendar.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'libjava/java/util') diff --git a/libjava/java/util/Calendar.java b/libjava/java/util/Calendar.java index f4806a35bdc..bd022a7a54c 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 cfa98bdc58d..5f1374e79ce 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; } -- cgit v1.2.3