stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6191224: (reflect) Misleading detail string in IllegalArgumentException thrown by Array.get<Type>

Browse Source 
The test case shows that an exception is thrown with the message "Argument is not an array", when in fact the argument is an array, but an array of a primitive type is actually what was expected. Fixed by differentiating between failing because an array was expected and failing because an array of a primitive type was expected.

Reviewed-by: dholmes, ctornqvi, lfoltan
This commit is contained in:
Chris Plummer 2014-10-23 14:43:08 -07:00
parent 1aa3da1067
commit 5306f2430a
2 changed files with 79 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hotspot/src/share/vm/prims/jvm.cpp
View File

@ -3271,8 +3271,10 @@ static inline arrayOop check_array(JNIEnv *env, jobject arr, bool type_array_onl
THROW_0(vmSymbols::java_lang_NullPointerException());
}
oop a = JNIHandles::resolve_non_null(arr);
if (!a->is_array() || (type_array_only && !a->is_typeArray())) {
if (!a->is_array()) {
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Argument is not an array");
} else if (type_array_only && !a->is_typeArray()) {
THROW_MSG_0(vmSymbols::java_lang_IllegalArgumentException(), "Argument is not an array of primitive type");
}
return arrayOop(a);
}

76
hotspot/test/runtime/reflect/ArrayGetIntException.java Normal file
View File

@ -0,0 +1,76 @@
/*
* Copyright (c) 2014, 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 6191224
* @summary (reflect) Misleading detail string in IllegalArgumentException thrown by Array.get<Type>
* @run main ArrayGetIntException
*/
import java.io.*;
import java.lang.reflect.Array;
public class ArrayGetIntException {
public static void main(String[] args) throws Exception {
Object[] objArray = {new Integer(Integer.MAX_VALUE)};
// this access is legal
try {
System.out.println(Array.get(objArray, 0));
System.out.println("Test #1 PASSES");
} catch(Exception e) {
failTest("Test #1 FAILS - legal access denied" + e.getMessage());
}
// this access is not legal, but needs to generate the proper exception message
try {
System.out.println(Array.getInt(objArray, 0));
failTest("Test #2 FAILS - no exception");
} catch(Exception e) {
System.out.println(e);
if (e.getMessage().equals("Argument is not an array of primitive type")) {
System.out.println("Test #2 PASSES");
} else {
failTest("Test #2 FAILS - incorrect message: " + e.getMessage());
}
}
// this access is not legal, but needs to generate the proper exception message
try {
System.out.println(Array.getInt(new Object(), 0));
failTest("Test #3 FAILS - no exception");
} catch(Exception e) {
System.out.println(e);
if (e.getMessage().equals("Argument is not an array")) {
System.out.println("Test #3 PASSES");
} else {
failTest("Test #3 FAILS - incorrect message: " + e.getMessage());
}
}
}
private static void failTest(String errStr) {
System.out.println(errStr);
throw new Error(errStr);
}
}