--- old/src/java.base/share/classes/java/text/CalendarBuilder.java	2020-01-02 13:01:46.000000000 -0800
+++ new/src/java.base/share/classes/java/text/CalendarBuilder.java	2020-01-02 13:01:45.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();
--- /dev/null	2020-01-02 13:01:47.000000000 -0800
+++ new/test/jdk/java/text/Format/DateFormat/bug8235699.java	2020-01-02 13:01:47.000000000 -0800
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2020, Amazon 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8235699
+ * @summary Check that CalendarBuilder.toString() works
+ * @build java.base/java.text.CalendarBuilderTest
+ * @run main bug8235699
+ */
+
+
+public class bug8235699 {
+    public static void main(String[] args) {
+        java.text.CalendarBuilderTest.testCalendarBuilderToString();
+    }
+}
--- /dev/null	2020-01-02 13:01:49.000000000 -0800
+++ new/test/jdk/java/text/Format/DateFormat/java.base/java/text/CalendarBuilderTest.java	2020-01-02 13:01:49.000000000 -0800
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2020, Amazon 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package java.text;
+
+/**
+ * Tests for CalendarBuilder class.
+ */
+
+import java.util.Calendar;
+
+public class CalendarBuilderTest {
+    public static void testCalendarBuilderToString() {
+        CalendarBuilder calendarBuilder = new CalendarBuilder();
+        calendarBuilder.set(Calendar.YEAR, 2020);
+        calendarBuilder.set(Calendar.MONDAY, Calendar.JANUARY);
+        calendarBuilder.set(Calendar.WEEK_OF_YEAR, 1);
+        calendarBuilder.set(Calendar.DAY_OF_YEAR, 1);
+        calendarBuilder.set(Calendar.HOUR, 12);
+        calendarBuilder.toString();
+    }
+}