natClass.cc (initializeClass): Throw NoClassDefFoundError with getName() as message.
* java/lang/natClass.cc (initializeClass): Throw NoClassDefFoundError with getName() as message. (_Jv_CheckArrayStore): Throw ArrayStoreException with object and array type as message. * java/lang/natVMThrowable.cc: Don't declare parameter t, it is unused. From-SVN: r58991
This commit is contained in:
committed by
Mark Wielaard
parent
9d8f417b41
commit
c0cd8f67f1
@@ -751,7 +751,7 @@ java::lang::Class::initializeClass (void)
|
||||
if (state == JV_STATE_ERROR)
|
||||
{
|
||||
_Jv_MonitorExit (this);
|
||||
throw new java::lang::NoClassDefFoundError;
|
||||
throw new java::lang::NoClassDefFoundError (getName());
|
||||
}
|
||||
|
||||
// Step 6.
|
||||
@@ -1043,7 +1043,12 @@ _Jv_CheckArrayStore (jobject arr, jobject obj)
|
||||
jclass obj_class = JV_CLASS (obj);
|
||||
if (__builtin_expect
|
||||
(! _Jv_IsAssignableFrom (elt_class, obj_class), false))
|
||||
throw new java::lang::ArrayStoreException;
|
||||
throw new java::lang::ArrayStoreException
|
||||
((new java::lang::StringBuffer
|
||||
(JvNewStringUTF("Cannot store ")))->append
|
||||
(obj_class->getName())->append
|
||||
(JvNewStringUTF(" in array of type "))->append
|
||||
(elt_class->getName())->toString());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -44,7 +44,7 @@ details. */
|
||||
arbitrary. It may be better to configure this. */
|
||||
|
||||
java::lang::VMThrowable *
|
||||
java::lang::VMThrowable::fillInStackTrace (java::lang::Throwable* t)
|
||||
java::lang::VMThrowable::fillInStackTrace (java::lang::Throwable*)
|
||||
{
|
||||
if (! trace_enabled)
|
||||
return NULL;
|
||||
|
||||
Reference in New Issue
Block a user