--- a/jdk/src/share/classes/java/util/Calendar.java	Wed Sep 10 19:16:14 2008 +0400
+++ b/jdk/src/share/classes/java/util/Calendar.java	Thu Oct 02 15:54:59 2008 +0900
@@ -1190,7 +1190,9 @@
      */
     public void set(int field, int value)
     {
-        if (isLenient() && areFieldsSet && !areAllFieldsSet) {
+        // If the fields are partially normalized, calculate all the
+        // fields before changing any fields.
+        if (areFieldsSet && !areAllFieldsSet) {
             computeFields();
         }
         internalSet(field, value);