ObjectOutputStream.java (writeObject): Per spec, call NotSerializableException with...

	* java/io/ObjectOutputStream.java (writeObject): Per spec, call
	NotSerializableException with just the class name.

From-SVN: r35325

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 993ff45..29e2d8e 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-28  Warren Levy  <warrenl@cygnus.com>
+
+       * java/io/ObjectOutputStream.java (writeObject): Per spec, call
+       NotSerializableException with just the class name.
+
 2000-07-26  Andrew Haley  <aph@cygnus.com>
 
        * interpret.cc (continue1): Insert missing break into switch.

diff --git a/libjava/java/io/ObjectOutputStream.java b/libjava/java/io/ObjectOutputStream.java
index a13f14a..9c758b0 100644 (file)
--- a/libjava/java/io/ObjectOutputStream.java
+++ b/libjava/java/io/ObjectOutputStream.java
@@ -267,9 +267,7 @@ public class ObjectOutputStream extends OutputStream
        Class clazz = obj.getClass ();
        ObjectStreamClass osc = ObjectStreamClass.lookup (clazz);
        if (osc == null)
-         throw new NotSerializableException ("The class "
-                                             + clazz.getName ()
-                                             + " is not Serializable");
+         throw new NotSerializableException (clazz.getName ());
 
        if (clazz.isArray ())
        {
@@ -334,9 +332,7 @@ public class ObjectOutputStream extends OutputStream
          break;
        }
 
-       throw new NotSerializableException ("Instances of the class "
-                                           + clazz.getName ()
-                                           + " are not Serializable");
+       throw new NotSerializableException (clazz.getName ());
       } // end pseudo-loop
     }
     catch (IOException e)