# HG changeset patch
# User simonis
# Date 1577971002 -3600
#      Thu Jan 02 14:16:42 2020 +0100
# Node ID 272b4ca5cbab119bac5505dedc5ee5b55bf9891f
# Parent  7c2236ea739e5899700f78a71ff27d3dd5c2725d
8235699: ArrayIndexOutOfBoundsException in CalendarBuilder.toString
Reviewed-by: phh, alanb, weijun, simonis
Contributed-by: verghese@amazon.com

diff --git a/src/java.base/share/classes/java/text/CalendarBuilder.java b/src/java.base/share/classes/java/text/CalendarBuilder.java
--- a/src/java.base/share/classes/java/text/CalendarBuilder.java
+++ b/src/java.base/share/classes/java/text/CalendarBuilder.java
@@ -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();
diff --git a/test/jdk/java/text/Format/DateFormat/CalendarBuilderTest.java b/test/jdk/java/text/Format/DateFormat/CalendarBuilderTest.java
new file mode 100644
--- /dev/null
+++ b/test/jdk/java/text/Format/DateFormat/CalendarBuilderTest.java
@@ -0,0 +1,53 @@
+/*
+ * 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
+ * @modules java.base/java.text:+open
+ * @run main/othervm CalendarBuilderTest
+ * @author simonisv@amazon.de
+ */
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import static java.util.Calendar.*;
+
+public class CalendarBuilderTest {
+
+    public static void main(String[] args) throws Exception {
+        Class<?> calendarBuilderClass = Class.forName("java.text.CalendarBuilder");
+        Constructor calendarBuilderConstructor = calendarBuilderClass.getDeclaredConstructor();
+        calendarBuilderConstructor.setAccessible(true);
+        Object calendarBuilder = calendarBuilderConstructor.newInstance();
+        Method setIndex = calendarBuilderClass.getDeclaredMethod("set", int.class, int.class);
+        setIndex.setAccessible(true);
+        setIndex.invoke(calendarBuilder, YEAR, 2020);
+        setIndex.invoke(calendarBuilder, MONTH, JANUARY);
+        setIndex.invoke(calendarBuilder, WEEK_OF_YEAR, 1);
+        setIndex.invoke(calendarBuilder, DAY_OF_YEAR, 1);
+        setIndex.invoke(calendarBuilder, HOUR, 12);
+        System.out.println(calendarBuilder.toString());
+    }
+}