aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wielaard <mark@gcc.gnu.org>2006-07-21 19:13:22 +0000
committerMark Wielaard <mark@gcc.gnu.org>2006-07-21 19:13:22 +0000
commit099cf3548ae0764f3d388325ce1d1200f10fac5a (patch)
treec34810fe615f55f979921e75aafea2f8d285ca89
parentb247341e06bea40b66bca5f719071b8acfc0aa07 (diff)
downloadgcc-099cf3548ae0764f3d388325ce1d1200f10fac5a.zip
gcc-099cf3548ae0764f3d388325ce1d1200f10fac5a.tar.gz
gcc-099cf3548ae0764f3d388325ce1d1200f10fac5a.tar.bz2
* java/io/OutputStreamWriter.java (flush): Create work if null.
From-SVN: r115647
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/java/io/OutputStreamWriter.java2
2 files changed, 7 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9705ebe..e793eea 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-21 Mark Wielaard <mark@klomp.org>
+
+ * java/io/OutputStreamWriter.java (flush): Create work if null.
+
2006-07-21 Keith Seitz <keiths@redhat.com>
* java/lang/natThread.cc (_Jv_ThreadGetData): New function.
@@ -33,7 +37,7 @@
2006-07-18 Paolo Bonzini <bonzini@gnu.org>
- * configure: Regenerate.
+ * configure: Regenerate.
2006-07-18 Gary Benson <gbenson@redhat.com>
diff --git a/libjava/java/io/OutputStreamWriter.java b/libjava/java/io/OutputStreamWriter.java
index 1f1666f..aac1684 100644
--- a/libjava/java/io/OutputStreamWriter.java
+++ b/libjava/java/io/OutputStreamWriter.java
@@ -203,6 +203,8 @@ public class OutputStreamWriter extends Writer
// Always write -- if we are close()ing then we want to make
// sure the converter is flushed.
+ if (work == null)
+ work = new char[100];
writeChars(work, 0, wcount);
wcount = 0;