# HG changeset patch
# User lana
# Date 1381463856 25200
# Node ID 401496f74fcb7944b2ce257646a40fcb60460099
# Parent fd59589eab62550aa281d9641d5421903eecf4fc# Parent 235451dd936a3cd2f21494f149d10211be8efca9
Merge
diff -r fd59589eab62 -r 401496f74fcb jdk/src/share/classes/java/lang/reflect/Array.java
--- a/jdk/src/share/classes/java/lang/reflect/Array.java Thu Oct 10 13:33:02 2013 -0700
+++ b/jdk/src/share/classes/java/lang/reflect/Array.java Thu Oct 10 20:57:36 2013 -0700
@@ -55,13 +55,18 @@
* </pre>
* </blockquote>
*
+ * <p>The number of dimensions of the new array must not
+ * exceed 255.
+ *
* @param componentType the {@code Class} object representing the
* component type of the new array
* @param length the length of the new array
* @return the new array
* @exception NullPointerException if the specified
* {@code componentType} parameter is null
- * @exception IllegalArgumentException if componentType is {@link Void#TYPE}
+ * @exception IllegalArgumentException if componentType is {@link
+ * Void#TYPE} or if the number of dimensions of the requested array
+ * instance exceed 255.
* @exception NegativeArraySizeException if the specified {@code length}
* is negative
*/
@@ -85,8 +90,7 @@
* {@code componentType}.
*
* <p>The number of dimensions of the new array must not
- * exceed the number of array dimensions supported by the
- * implementation (typically 255).
+ * exceed 255.
*
* @param componentType the {@code Class} object representing the component
* type of the new array
@@ -96,10 +100,9 @@
* @exception NullPointerException if the specified
* {@code componentType} argument is null
* @exception IllegalArgumentException if the specified {@code dimensions}
- * argument is a zero-dimensional array, or if the number of
- * requested dimensions exceeds the limit on the number of array dimensions
- * supported by the implementation (typically 255), or if componentType
- * is {@link Void#TYPE}.
+ * argument is a zero-dimensional array, if componentType is {@link
+ * Void#TYPE}, or if the number of dimensions of the requested array
+ * instance exceed 255.
* @exception NegativeArraySizeException if any of the components in
* the specified {@code dimensions} argument is negative.
*/
diff -r fd59589eab62 -r 401496f74fcb jdk/src/share/classes/java/lang/reflect/MalformedParametersException.java
--- a/jdk/src/share/classes/java/lang/reflect/MalformedParametersException.java Thu Oct 10 13:33:02 2013 -0700
+++ b/jdk/src/share/classes/java/lang/reflect/MalformedParametersException.java Thu Oct 10 20:57:36 2013 -0700
@@ -50,10 +50,22 @@
*/
public class MalformedParametersException extends RuntimeException {
+ /**
+ * Version for serialization.
+ */
private static final long serialVersionUID = 20130919L;
+ /**
+ * Create a {@code MalformedParametersException} with an empty
+ * reason.
+ */
public MalformedParametersException() {}
+ /**
+ * Create a {@code MalformedParametersException}.
+ *
+ * @param reason The reason for the exception.
+ */
public MalformedParametersException(String reason) {
super(reason);
}
diff -r fd59589eab62 -r 401496f74fcb jdk/test/java/lang/Class/forName/arrayClass/Class1.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/Class/forName/arrayClass/Class1.java Thu Oct 10 20:57:36 2013 -0700
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2013, 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
+ * 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.
+ */
+
+public class Class1 {}
diff -r fd59589eab62 -r 401496f74fcb jdk/test/java/lang/Class/forName/arrayClass/Class2.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/Class/forName/arrayClass/Class2.java Thu Oct 10 20:57:36 2013 -0700
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2013, 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
+ * 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.
+ */
+
+public class Class2 {}
diff -r fd59589eab62 -r 401496f74fcb jdk/test/java/lang/Class/forName/arrayClass/Class3.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/Class/forName/arrayClass/Class3.java Thu Oct 10 20:57:36 2013 -0700
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2013, 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
+ * 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.
+ */
+
+public class Class3 {}
diff -r fd59589eab62 -r 401496f74fcb jdk/test/java/lang/Class/forName/arrayClass/Class4.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/Class/forName/arrayClass/Class4.java Thu Oct 10 20:57:36 2013 -0700
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2013, 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
+ * 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.
+ */
+
+public class Class4 {}
diff -r fd59589eab62 -r 401496f74fcb jdk/test/java/lang/Class/forName/arrayClass/ExceedMaxDim.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/Class/forName/arrayClass/ExceedMaxDim.java Thu Oct 10 20:57:36 2013 -0700
@@ -0,0 +1,129 @@
+/*
+ * Copyright (c) 2013, 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
+ * 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 7044282
+ * @build Class1 Class2 Class3 Class4
+ * @run main ExceedMaxDim
+ * @summary Make sure you can't get an array class of dimension > 255.
+ */
+
+// Class1, Class2, Class3 and Class4 should not have been loaded prior to the
+// calls to forName
+
+public class ExceedMaxDim {
+ //0123456789012345678901234567890123456789
+ private String brackets = "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[" +
+ "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[" +
+ "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[" +
+ "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[" +
+ "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[" +
+ "[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[" +
+ "[[[[[[[[[[[[[[";
+ private String name254 = brackets + "Ljava.lang.String;";
+ private String name255 = "[" + name254;
+ private String name256 = "[" + name255;
+ private String name1 = "[Ljava.lang.String;";
+ private String bigName;
+ private int error = 0;
+
+ private static final ClassLoader IMPLICIT_LOADER = null;
+
+ public ExceedMaxDim() {
+ super();
+
+ StringBuilder sb = new StringBuilder(Short.MAX_VALUE + 50);
+ for (int i = 0; i < Short.MAX_VALUE + 20; i++)
+ sb.append('[');
+ sb.append("Ljava.lang.String;");
+ bigName = sb.toString();
+
+ if (name256.lastIndexOf('[') != 255) // 256:th [
+ throw new RuntimeException("Test broken");
+ }
+
+ public static void main(String[] args) throws Exception {
+ ExceedMaxDim test = new ExceedMaxDim();
+ test.testImplicitLoader();
+ test.testOtherLoader();
+
+ if (test.error != 0)
+ throw new RuntimeException("Test failed, was able to create array with dim > 255." +
+ " See log for details.");
+ }
+
+ private void testImplicitLoader() throws Exception {
+ // These four should succeed
+ assertSucceedForName(name1, IMPLICIT_LOADER);
+ assertSucceedForName(name254, IMPLICIT_LOADER);
+ assertSucceedForName(name255, IMPLICIT_LOADER);
+ assertSucceedForName(brackets + "[LClass1;", IMPLICIT_LOADER);
+
+ // The following three should fail
+ assertFailForName(name256, IMPLICIT_LOADER);
+ assertFailForName(bigName, IMPLICIT_LOADER);
+ assertFailForName(brackets + "[[LClass2;", IMPLICIT_LOADER);
+ }
+
+ private void testOtherLoader() throws Exception {
+ ClassLoader cl = ExceedMaxDim.class.getClassLoader();
+
+ // These four should succeed
+ assertSucceedForName(name1, cl);
+ assertSucceedForName(name254,cl);
+ assertSucceedForName(name255, cl);
+ assertSucceedForName(brackets + "[LClass3;", cl);
+
+ // The following three should fail
+ assertFailForName(name256, cl);
+ assertFailForName(bigName, cl);
+ assertFailForName(brackets + "[[Class4;", cl);
+ }
+
+ private void assertFailForName(String name, ClassLoader cl) {
+ Class<?> c;
+ try {
+ if (cl == null)
+ c = Class.forName(name);
+ else
+ c = Class.forName(name, true, cl);
+ error++;
+ System.err.println("ERROR: could create " + c);
+ } catch (ClassNotFoundException e) {
+ ;// ok
+ }
+ }
+
+ private void assertSucceedForName(String name, ClassLoader cl) {
+ Class<?> c;
+ try {
+ if (cl == null)
+ c = Class.forName(name);
+ else
+ c = Class.forName(name, true, cl);
+ } catch (ClassNotFoundException e) {
+ error++;
+ System.err.println("ERROR: could not create " + name);
+ }
+ }
+}
diff -r fd59589eab62 -r 401496f74fcb jdk/test/java/lang/reflect/Array/ExceedMaxDim.java
--- a/jdk/test/java/lang/reflect/Array/ExceedMaxDim.java Thu Oct 10 13:33:02 2013 -0700
+++ b/jdk/test/java/lang/reflect/Array/ExceedMaxDim.java Thu Oct 10 20:57:36 2013 -0700
@@ -22,7 +22,7 @@
*/
/* @test
- * @bug 4100814
+ * @bug 4100814 7044282
* @summary Make sure you can't create an array of dimension > 256.
*/
diff -r fd59589eab62 -r 401496f74fcb jdk/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java
--- a/jdk/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java Thu Oct 10 13:33:02 2013 -0700
+++ b/jdk/test/javax/management/remote/mandatory/connection/IdleTimeoutTest.java Thu Oct 10 20:57:36 2013 -0700
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4886838 4886830
+ * @bug 4886838 4886830 8025204
* @summary Tests that idle timeouts happen at appropriate times
* @author Eamonn McManus
* @run clean IdleTimeoutTest
@@ -278,19 +278,11 @@
}
System.out.println("Waiting for id list to drop ours");
- deadline = System.currentTimeMillis() + timeout*2 + 10000;
- while (true) {
- ids = Arrays.asList(server.getConnectionIds());
- if (!ids.contains(connId)
- || System.currentTimeMillis() >= deadline)
- break;
- Thread.sleep(500);
- }
- if (ids.contains(connId)) {
- System.out.println("Client id still in list after " +
- "deadline: " + ids);
- return false;
- }
+ // pass or timed out by test harness - see 8025204
+ do {
+ Thread.sleep(100);
+ ids = Arrays.asList(server.getConnectionIds());
+ } while (ids.contains(connId));
conn.getDefaultDomain();
if (connId.equals(client.getConnectionId())) {