archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 11:04:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
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);
}