From: Tom Tromey <tromey@cygnus.com>
Date: Thu, 8 Apr 1999 11:41:01 +0000 (+0000)
Subject: PrintStream.java (print): Handle null string argument.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e086449d2a918858b784ccc0032d5a87b3e55d06;p=gcc.git

PrintStream.java (print): Handle null string argument.

	* java/io/PrintStream.java (print): Handle null string argument.
	(println): Likewise.

From-SVN: r26294
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1d3bb42afcf..eaeff0b0edb 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+1999-04-08  Tom Tromey  <tromey@cygnus.com>
+
+	* java/io/PrintStream.java (print): Handle null string argument.
+	(println): Likewise.
+
 1999-04-07  Warren Levy  <warrenl@cygnus.com>
 
 	* java/lang/natString.cc (init(jbyteArray,jint,jint,jstring)):
diff --git a/libjava/java/io/PrintStream.java b/libjava/java/io/PrintStream.java
index 499e5eb7059..96a5a6e81de 100644
--- a/libjava/java/io/PrintStream.java
+++ b/libjava/java/io/PrintStream.java
@@ -99,7 +99,7 @@ public class PrintStream extends FilterOutputStream
 
   public void print (String str)
   {
-    print (str, true);
+    print (str == null ? "null" : str, true);
   }
 
   public void print (char ch)
@@ -157,7 +157,7 @@ public class PrintStream extends FilterOutputStream
 
   public void println (String str)
   {
-    print (str, false);
+    print (str == null ? "null" : str, false);
     println ();
   }