natClass.cc (_Jv_CheckCast): add class names to exception

* java/lang/natClass.cc (_Jv_CheckCast): add class names to exception
* gnu/gcj/runtime/FirstThread.java (main): replace / with . in jarMainClassName

From-SVN: r40604

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 4ba2d8673b808db52f35349a2f386289c428b8dc..2affb64ded11da37ddf514f06eb4e87dbfe0535b 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,12 @@
+2001-03-18  Mark Wielaard  <mark@klomp.org>
+
+       * java/lang/natClass.cc (_Jv_CheckCast): add class names to exception
+
+2001-03-18  Mark Wielaard  <mark@klomp.org>
+
+       * gnu/gcj/runtime/FirstThread.java (main): replace / with . in
+       jarMainClassName
+
 2001-03-17  Tom Tromey  <tromey@redhat.com>
 
        * java/lang/natString.cc (rehash): Don't bother with memset;
@@ -32,12 +41,14 @@
        Only try to print the subordinate stack trace if "exception" is set.
        Print our class name first.
 
+>>>>>>> 1.710
 2001-03-08  Tom Tromey  <tromey@redhat.com>
 
        * java/io/ObjectStreamClass.java (setUID): Don't write interface
        info for array classes.
        Fixes PR libgcj/1971.
 
+>>>>>>> 1.707
 2001-03-06  Bryce McKinlay  <bryce@albatross.co.nz>
 
        * java/util/TreeSet.java (writeObject): Use a for-loop instead of
@@ -50,6 +61,7 @@
        back-porting the classes to JDK1.1 trivial.
        (readObject): likewise.
        
+>>>>>>> 1.706
 2001-03-01  Per Bothner  <per@bothner.com>
 
        Changes merged from Kawa's gnu.math.
@@ -124,6 +136,7 @@
        which are alive.
        (enumerate): Likewise.
 
+>>>>>>> 1.705
 2001-02-19  Bryce McKinlay  <bryce@albatross.co.nz>
 
        * java/lang/Integer.java (getInteger): Return default argument if
@@ -135,6 +148,7 @@
        (ready): Return false if no more characters can be read.
        * java/io/ByteArrayInputStream.java (ByteArrayInputStream): Likewise.
 
+>>>>>>> 1.696
 2001-02-17  Mark Wielaard <mark@klomp.org>
 
        * java/util/TimerTask.java: New version from Classpath.

diff --git a/libjava/gnu/gcj/runtime/FirstThread.java b/libjava/gnu/gcj/runtime/FirstThread.java
index a928c9cdb59aaefb67aae61fdc750a5784f76c7a..469d5dde5886e29a2e42fb201bf4e7acdd5fb30b 100644 (file)
--- a/libjava/gnu/gcj/runtime/FirstThread.java
+++ b/libjava/gnu/gcj/runtime/FirstThread.java
@@ -56,8 +56,10 @@ final class FirstThread extends Thread
       jarMainClassName = a.getValue(Attributes.Name.MAIN_CLASS);
 
       if (jarMainClassName != null)
+      {
+       jarMainClassName = jarMainClassName.replace('/','.');
        return;
-
+      }
     } catch (Exception e) {
       // empty
     }

diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc
index a1008d692d054067d7e9b11f8c981678b0cdd153..11f5e50a858f550df4515f6255a75a6b0e3978da 100644 (file)
--- a/libjava/java/lang/natClass.cc
+++ b/libjava/java/lang/natClass.cc
@@ -983,7 +983,12 @@ _Jv_CheckCast (jclass c, jobject obj)
 {
   if (__builtin_expect 
        (obj != NULL && ! _Jv_IsAssignableFrom(c, JV_CLASS (obj)), false))
-    JvThrow (new java::lang::ClassCastException);
+    JvThrow (new java::lang::ClassCastException
+            ((new java::lang::StringBuffer
+             (obj->getClass()->getName()))->append
+             (JvNewStringUTF(" cannot be cast to "))->append
+             (c->getName())->toString()));
+
   return obj;
 }