Index: E:/projects/clear/eclipse/workspace/text/src/main/java/java/text/DateFormat.java =================================================================== --- E:/projects/clear/eclipse/workspace/text/src/main/java/java/text/DateFormat.java (revision 382315) +++ E:/projects/clear/eclipse/workspace/text/src/main/java/java/text/DateFormat.java (working copy) @@ -15,7 +15,6 @@ package java.text; - import java.io.InvalidObjectException; import java.util.Calendar; import java.util.Date; @@ -327,8 +326,9 @@ } /** - * Answers a DateFormat instance for the formatting and parsing - * of both dates and times in the manner appropriate to the default Locale. + * Answers a DateFormat instance for the formatting and + * parsing of both dates and times in the manner appropriate to the default + * Locale. * * @param dateStyle * one of SHORT, MEDIUM, LONG, FULL, or DEFAULT @@ -633,7 +633,8 @@ protected Field(String fieldName, int calendarField) { super(fieldName); this.calendarField = calendarField; - if (calendarField != -1) + if (calendarField != -1 + && table.get(new Integer(calendarField)) == null) table.put(new Integer(calendarField), this); }