ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-07 13:38:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

return null for non-array classes in JVM_GetComponentType

Browse Source
This commit is contained in:
Joel Dice 2011-03-17 09:41:52 -06:00
parent 0922dd3429
commit 023e1d93d5
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/classpath-openjdk.cpp
View File

@ -3500,14 +3500,18 @@ jvmGetComponentType(Thread* t, uintptr_t* arguments)
{
jclass c = reinterpret_cast<jobject>(arguments[0]);
uint8_t n = byteArrayBody(t, className(t, jclassVmClass(t, *c)), 1);
if (n != 'L' and n != '[') {
return reinterpret_cast<uintptr_t>
(makeLocalReference(t, getJClass(t, primitiveClass(t, n))));
if (classArrayDimensions(t, jclassVmClass(t, *c))) {
uint8_t n = byteArrayBody(t, className(t, jclassVmClass(t, *c)), 1);
if (n != 'L' and n != '[') {
return reinterpret_cast<uintptr_t>
(makeLocalReference(t, getJClass(t, primitiveClass(t, n))));
} else {
return reinterpret_cast<uintptr_t>
(makeLocalReference
(t, getJClass(t, classStaticTable(t, jclassVmClass(t, *c)))));
}
} else {
return reinterpret_cast<uintptr_t>
(makeLocalReference
(t, getJClass(t, classStaticTable(t, jclassVmClass(t, *c)))));
return 0;
}
}