From 96fa18eb49018ae88dae0f4c45216ef5cdf8de2e Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 13 Sep 2000 18:15:42 +0000 Subject: 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/java/lang/reflect/natArray.cc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'libjava/java/lang/reflect/natArray.cc') 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 #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()); } -- cgit v1.1