From 659c26fc492ecf35fd18859a9e9c75df956c4275 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Thu, 1 Jul 1999 19:58:04 +0000 Subject: [PATCH] String.java (toString): Check for this == null and throw NullPointerException. 1999-07-01 Bryce McKinlay * java/lang/String.java (toString): Check for this == null and throw NullPointerException. From-SVN: r27895 --- libjava/ChangeLog | 5 +++++ libjava/java/lang/String.java | 3 +++ 2 files changed, 8 insertions(+) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 247da09a787..892665fcccc 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +1999-07-01 Bryce McKinlay + + * java/lang/String.java (toString): Check for this == null and throw + NullPointerException. + 1999-07-01 Warren Levy * gnu/gcj/convert/BytesToUnicode.java (read): Changed outlength diff --git a/libjava/java/lang/String.java b/libjava/java/lang/String.java index 55cc9cd9410..c1c7c1824d9 100644 --- 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; } -- 2.30.2