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

1999-07-01  Bryce McKinlay  <bryce@albatross.co.nz>
        * java/lang/String.java (toString): Check for this == null and throw
        NullPointerException.

From-SVN: r27895

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 247da09a787767dbd621d4f41acda59fbf69f64e..892665fcccc8fb2d7a93862590912642a69f036e 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 55cc9cd9410bf7da2dd9e7b40118284a20ad2ae8..c1c7c1824d95826a321a25c7e7daa52f8e1eb296 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;
   }