diff options
| author | Tom Tromey <tromey@redhat.com> | 2006-06-27 20:38:10 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2006-06-27 20:38:10 +0000 |
| commit | 9e01bff779fdaf1fb6621fe30f679d6aca0029ec (patch) | |
| tree | 4559b8284607c63eae3517638fbdf14bec92fafd /libjava/java/io/PrintStream.java | |
| parent | 80cd0e33d9bcc374f71e86eb710d05ac12ff20ab (diff) | |
| download | gcc-9e01bff779fdaf1fb6621fe30f679d6aca0029ec.zip gcc-9e01bff779fdaf1fb6621fe30f679d6aca0029ec.tar.gz gcc-9e01bff779fdaf1fb6621fe30f679d6aca0029ec.tar.bz2 | |
OutputStreamWriter.java (writeChars): Use a 'do' loop.
* java/io/OutputStreamWriter.java (writeChars): Use a 'do' loop.
Set 'out.count' earlier.
(close): Call setFinished on converter.
(flush): Always write work buffer.
* java/io/PrintStream.java (writeChars): Do 'do' loop.
(close): Call setFinished on converter. Write a 'flush' array.
* java/lang/natString.cc (getBytes): Call setFinished on
converter.
* gnu/gcj/convert/CharsetToBytesAdaptor.java (hasBytes): New
field.
(write): Set hasBytes. Changed 'finished' logic.
(havePendingBytes): Rewrote.
(setFinished): New method.
* gnu/gcj/convert/UnicodeToBytes.java (setFinished): New method.
* testsuite/libjava.lang/RH194522.java: New file.
* testsuite/libjava.lang/RH194522.out: New file.
From-SVN: r115039
Diffstat (limited to 'libjava/java/io/PrintStream.java')
| -rw-r--r-- | libjava/java/io/PrintStream.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libjava/java/io/PrintStream.java b/libjava/java/io/PrintStream.java index 4756c8c..dc26eda 100644 --- a/libjava/java/io/PrintStream.java +++ b/libjava/java/io/PrintStream.java @@ -1,5 +1,5 @@ /* PrintStream.java -- OutputStream for printing output - Copyright (C) 1998, 1999, 2001, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -174,6 +174,8 @@ public class PrintStream extends FilterOutputStream { try { + converter.setFinished(); + writeChars(new char[0], 0, 0); flush(); out.close(); } @@ -251,7 +253,7 @@ public class PrintStream extends FilterOutputStream private void writeChars(char[] buf, int offset, int count) throws IOException { - while (count > 0 || converter.havePendingBytes()) + do { converter.setOutput(work_bytes, 0); int converted = converter.write(buf, offset, count); @@ -259,12 +261,13 @@ public class PrintStream extends FilterOutputStream count -= converted; out.write(work_bytes, 0, converter.count); } + while (count > 0 || converter.havePendingBytes()); } private void writeChars(String str, int offset, int count) throws IOException { - while (count > 0 || converter.havePendingBytes()) + do { converter.setOutput(work_bytes, 0); int converted = converter.write(str, offset, count, work); @@ -272,6 +275,7 @@ public class PrintStream extends FilterOutputStream count -= converted; out.write(work_bytes, 0, converter.count); } + while (count > 0 || converter.havePendingBytes()); } /** |