aboutsummaryrefslogtreecommitdiff
path: root/libjava/java
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/java')
-rw-r--r--libjava/java/lang/reflect/natArray.cc14
-rw-r--r--libjava/java/lang/reflect/natField.cc14
2 files changed, 20 insertions, 8 deletions
diff --git a/libjava/java/lang/reflect/natArray.cc b/libjava/java/lang/reflect/natArray.cc
index fd95368..4bce9ce 100644
--- a/libjava/java/lang/reflect/natArray.cc
+++ b/libjava/java/lang/reflect/natArray.cc
@@ -25,6 +25,9 @@ details. */
#include <java/lang/Boolean.h>
#include <java/lang/Character.h>
+#define BooleanClass _CL_Q34java4lang7Boolean
+extern java::lang::Class BooleanClass;
+
jobject
java::lang::reflect::Array::newInstance (jclass componentType, jint length)
{
@@ -211,10 +214,13 @@ java::lang::reflect::Array::get (jobject array, jint index)
if (elementType == JvPrimClass (char))
return new java::lang::Character (elements ((jcharArray) array) [index]);
if (elementType == JvPrimClass (boolean))
- if (elements ((jbooleanArray) array) [index])
- return java::lang::Boolean::TRUE;
- else
- return java::lang::Boolean::FALSE;
+ {
+ _Jv_InitClass (&BooleanClass);
+ if (elements ((jbooleanArray) array) [index])
+ return java::lang::Boolean::TRUE;
+ else
+ return java::lang::Boolean::FALSE;
+ }
JvThrow (new java::lang::IllegalArgumentException());
}
diff --git a/libjava/java/lang/reflect/natField.cc b/libjava/java/lang/reflect/natField.cc
index 7613243..3cd296c 100644
--- a/libjava/java/lang/reflect/natField.cc
+++ b/libjava/java/lang/reflect/natField.cc
@@ -26,6 +26,9 @@ details. */
#include <java/lang/Boolean.h>
#include <java/lang/Character.h>
+#define BooleanClass _CL_Q34java4lang7Boolean
+extern java::lang::Class BooleanClass;
+
jint
java::lang::reflect::Field::getModifiers ()
{
@@ -251,10 +254,13 @@ java::lang::reflect::Field::get (jclass caller, jobject obj)
if (fld->type == JvPrimClass (char))
return new java::lang::Character (* (jchar*) addr);
if (fld->type == JvPrimClass (boolean))
- if (* (jboolean*) addr)
- return java::lang::Boolean::TRUE;
- else
- return java::lang::Boolean::FALSE;
+ {
+ _Jv_InitClass (&BooleanClass);
+ if (* (jboolean*) addr)
+ return java::lang::Boolean::TRUE;
+ else
+ return java::lang::Boolean::FALSE;
+ }
JvThrow (new java::lang::IllegalArgumentException());
}