1999-07-01 Bryce McKinlay <bryce@albatross.co.nz>

        * java/lang/String.java (toString): Check for this == null and throw
        NullPointerException.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27895 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 247da09..892665f 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+1999-07-01  Bryce McKinlay  <bryce@albatross.co.nz>
+
+       * java/lang/String.java (toString): Check for this == null and throw
+       NullPointerException.
+
 1999-07-01  Warren Levy  <warrenl@cygnus.com>
 
        * gnu/gcj/convert/BytesToUnicode.java (read): Changed outlength

diff --git a/libjava/java/lang/String.java b/libjava/java/lang/String.java
index 55cc9cd..c1c7c18 100644 (file)
--- a/libjava/java/lang/String.java
+++ b/libjava/java/lang/String.java
@@ -115,6 +115,9 @@ public final class String
 
   public String toString ()
   {
+    // because String is final, we actually get this far on a null reference
+    if (this == null)
+      throw new NullPointerException();
     return this;
   }