From 96fa18eb49018ae88dae0f4c45216ef5cdf8de2e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 13 Sep 2000 18:15:42 +0000 Subject: [PATCH] natArray.cc (BooleanClass): New define. * java/lang/reflect/natArray.cc (BooleanClass): New define. (get): Ensure Boolean class is initialized. * java/lang/reflect/natField.cc (BooleanClass): New define. (get): Ensure Boolean class is initialized. From-SVN: r36391 --- libjava/ChangeLog | 7 +++++++ libjava/java/lang/reflect/natArray.cc | 14 ++++++++++---- libjava/java/lang/reflect/natField.cc | 14 ++++++++++---- 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index fb5bdd8302e..85cddc2d312 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2000-09-13 Tom Tromey + + * java/lang/reflect/natArray.cc (BooleanClass): New define. + (get): Ensure Boolean class is initialized. + * java/lang/reflect/natField.cc (BooleanClass): New define. + (get): Ensure Boolean class is initialized. + 2000-09-13 Bryce McKinlay * java/lang/String.java (CASE_INSENSITIVE_ORDER): New static field. diff --git a/libjava/java/lang/reflect/natArray.cc b/libjava/java/lang/reflect/natArray.cc index fd9536889dc..4bce9ce8c0a 100644 --- a/libjava/java/lang/reflect/natArray.cc +++ b/libjava/java/lang/reflect/natArray.cc @@ -25,6 +25,9 @@ details. */ #include #include +#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 761324385f9..3cd296c7021 100644 --- a/libjava/java/lang/reflect/natField.cc +++ b/libjava/java/lang/reflect/natField.cc @@ -26,6 +26,9 @@ details. */ #include #include +#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()); } -- 2.30.2