2005-11-01 Jeroen Frijters <jeroen@frijters.net>

        * java/io/ObjectOutputStream.java
        (writeObject): Fixed NPE.

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c40cb2390..1933036a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-01  Jeroen Frijters  <jeroen@frijters.net>
+
+	* java/io/ObjectOutputStream.java
+	(writeObject): Fixed NPE.
+
 2005-10-31  Anthony Balkissoon  <abalkiss@redhat.com>
 
 	* javax/swing/plaf/basic/BasicTextAreaUI.java:
diff --git a/java/io/ObjectOutputStream.java b/java/io/ObjectOutputStream.java
index 9fb70454d..573b9cfa1 100644
--- a/java/io/ObjectOutputStream.java
+++ b/java/io/ObjectOutputStream.java
@@ -363,7 +363,7 @@ public class ObjectOutputStream extends OutputStream
 
 	    throw new NotSerializableException(clazz.getName()
 					       + " in "
-					       + currentObject.getClass());
+					       + obj.getClass());
 	  } // end pseudo-loop
       }
     catch (ObjectStreamException ose)