--- old/src/java.base/share/classes/java/text/CalendarBuilder.java	2020-02-04 14:09:49.000000000 -0800
+++ new/src/java.base/share/classes/java/text/CalendarBuilder.java	2020-02-04 14:09:49.000000000 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -148,9 +148,9 @@
 
     public String toString() {
         StringJoiner sj = new StringJoiner(",", "CalendarBuilder:[", "]");
-        for (int i = 0; i < field.length; i++) {
+        for (int i = 0; i < MAX_FIELD; i++) {
             if (isSet(i)) {
-                sj.add(i + "=" + field[MAX_FIELD + i]);
+                sj.add(i + "=" + field[i] + ":" + field[MAX_FIELD + i]);
             }
         }
         return sj.toString();