natConstructor.cc (newInstance): Initialize class.
* java/lang/reflect/natConstructor.cc (newInstance): Initialize class. * java/lang/reflect/natMethod.cc (invoke): Initialize class. From-SVN: r56624
This commit is contained in:
parent
7ee425e4d4
commit
f87999337a
3 changed files with 16 additions and 3 deletions
|
@ -1,6 +1,6 @@
|
|||
// natConstructor.cc - Native code for Constructor class.
|
||||
|
||||
/* Copyright (C) 1999, 2000, 2001 Free Software Foundation
|
||||
/* Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation
|
||||
|
||||
This file is part of libgcj.
|
||||
|
||||
|
@ -50,6 +50,8 @@ java::lang::reflect::Constructor::newInstance (jobjectArray args)
|
|||
if (Modifier::isAbstract (declaringClass->getModifiers()))
|
||||
throw new InstantiationException;
|
||||
|
||||
_Jv_InitClass (declaringClass);
|
||||
|
||||
jmethodID meth = _Jv_FromReflectedConstructor (this);
|
||||
// In the constructor case the return type is the type of the
|
||||
// constructor.
|
||||
|
|
|
@ -156,6 +156,13 @@ java::lang::reflect::Method::invoke (jobject obj, jobjectArray args)
|
|||
// of the object.
|
||||
meth = _Jv_LookupDeclaredMethod (k, meth->name, meth->signature);
|
||||
}
|
||||
else
|
||||
{
|
||||
// We have to initialize a static class. It is safe to do this
|
||||
// here and not in _Jv_CallAnyMethodA because JNI initializes a
|
||||
// class whenever a method lookup is done.
|
||||
_Jv_InitClass (declaringClass);
|
||||
}
|
||||
|
||||
return _Jv_CallAnyMethodA (obj, return_type, meth, false,
|
||||
parameter_types, args);
|
||||
|
@ -405,8 +412,6 @@ _Jv_CallAnyMethodA (jobject obj,
|
|||
p += tsize;
|
||||
}
|
||||
|
||||
// FIXME: initialize class here.
|
||||
|
||||
using namespace java::lang;
|
||||
using namespace java::lang::reflect;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue