summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--java/util/GregorianCalendar.java2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 77120522d..26fd4c99f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-25 Roman Kennke <kennke@aicas.com>
+
+ * java/util/GregorianCalender.java
+ (computeTime): Fix comparison to correctly calculate the
+ calendar.
+
2006-03-25 Wolfgang Baer <WBaer@gmx.de>
Fixes bug #26837
diff --git a/java/util/GregorianCalendar.java b/java/util/GregorianCalendar.java
index 89b7c4dbd..5ce053a37 100644
--- a/java/util/GregorianCalendar.java
+++ b/java/util/GregorianCalendar.java
@@ -588,7 +588,7 @@ public class GregorianCalendar extends Calendar
day = offs + 7 * (fields[WEEK_OF_MONTH] - 1);
offs = fields[DAY_OF_WEEK] - getFirstDayOfWeek();
- if (offs <= 0)
+ if (offs < 0)
offs += 7;
day += offs;
}