diff options
| author | Mark Wielaard <mark@klomp.org> | 2002-11-10 21:07:27 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@gcc.gnu.org> | 2002-11-10 21:07:27 +0000 |
| commit | c0cd8f67f17222b33f82ce6d144ba39748a97847 (patch) | |
| tree | fcdfb829cb4b4eb34743064606b65dc6ce830b17 | |
| parent | 9d8f417b41ee55cab1ea13bc242061487a9ca2b6 (diff) | |
| download | gcc-c0cd8f67f17222b33f82ce6d144ba39748a97847.zip gcc-c0cd8f67f17222b33f82ce6d144ba39748a97847.tar.gz gcc-c0cd8f67f17222b33f82ce6d144ba39748a97847.tar.bz2 | |
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
| -rw-r--r-- | libjava/ChangeLog | 10 | ||||
| -rw-r--r-- | libjava/java/lang/natClass.cc | 9 | ||||
| -rw-r--r-- | libjava/java/lang/natVMThrowable.cc | 2 |
3 files changed, 18 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index bd350f8..7481006 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,13 @@ +2002-11-10 Mark Wielaard <mark@klomp.org> + + * 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. + 2002-11-08 Ranjit Mathew <rmathew@hotmail.com> * include/jni.h (JNIIMPORT, JNIEXPORT, JNICALL): Linker defines diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc index 9e86111..fb412f2 100644 --- a/libjava/java/lang/natClass.cc +++ b/libjava/java/lang/natClass.cc @@ -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()); } } diff --git a/libjava/java/lang/natVMThrowable.cc b/libjava/java/lang/natVMThrowable.cc index ce897c2..c1b030d 100644 --- a/libjava/java/lang/natVMThrowable.cc +++ b/libjava/java/lang/natVMThrowable.cc @@ -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; |