aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorTom Tromey <tromey@cygnus.com>1999-04-08 11:41:01 +0000
committerTom Tromey <tromey@gcc.gnu.org>1999-04-08 11:41:01 +0000
commite086449d2a918858b784ccc0032d5a87b3e55d06 (patch)
tree2627143b6a7e61ff51a68fe6be54b6461468a01b /libjava
parent36ba9cb8d296d8a2e1cbf670474cc4a8af658c86 (diff)
downloadgcc-e086449d2a918858b784ccc0032d5a87b3e55d06.zip
gcc-e086449d2a918858b784ccc0032d5a87b3e55d06.tar.gz
gcc-e086449d2a918858b784ccc0032d5a87b3e55d06.tar.bz2
PrintStream.java (print): Handle null string argument.
* java/io/PrintStream.java (print): Handle null string argument. (println): Likewise. From-SVN: r26294
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/java/io/PrintStream.java4
2 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1d3bb42..eaeff0b 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 499e5eb..96a5a6e 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 ();
}