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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index bd350f8d628e346650d5f69e6212d9fc45676df5..7481006d2037e01cf2f490f015f22b7372e56e54 100644 (file)
--- 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 9e86111156372b67316878ce6f262e1c106af685..fb412f224b93efe9e3d285f4cb9b3204bcb899d8 100644 (file)
--- 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 ce897c23e0b9bf75ebdd8f2d5862ecebecaca03a..c1b030d42884815239f247110c55ec266c39cac1 100644 (file)
--- 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;