OutputStreamWriter.java (OutputStreamWriter): Reverted previous patch; it too was...

	* java/io/OutputStreamWriter.java (OutputStreamWriter): Reverted
	previous patch; it too was incorrect.
	* java/io/PrintStream.java (PrintStream): Likewise.

From-SVN: r29566

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9c632ef968f228ea2f00d33439abb9fd9555eebe..6ce5ae0dfb20411dc180181c010dd0c53ae8fdf9 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,9 @@
 1999-09-21  Tom Tromey  <tromey@cygnus.com>
 
+       * java/io/OutputStreamWriter.java (OutputStreamWriter): Reverted
+       previous patch; it too was incorrect.
+       * java/io/PrintStream.java (PrintStream): Likewise.
+
        * java/io/OutputStreamWriter.java (OutputStreamWriter): Don't
        refer to `this' before calling superclass constructor.
        * java/io/PrintStream.java (PrintStream): Don't refer to `this'

diff --git a/libjava/java/io/OutputStreamWriter.java b/libjava/java/io/OutputStreamWriter.java
index 310c3d6ece5ea6e3af7197c7a83148a289e02439..88841d9c1b4b9943712006d0604f655bea8ce3a8 100644 (file)
--- a/libjava/java/io/OutputStreamWriter.java
+++ b/libjava/java/io/OutputStreamWriter.java
@@ -32,11 +32,9 @@ public class OutputStreamWriter extends Writer
 
   private OutputStreamWriter(OutputStream out, UnicodeToBytes encoder)
   {
-    BufferedOutputStream buf = (out instanceof BufferedOutputStream
-                               ? (BufferedOutputStream) out
-                               : new BufferedOutputStream(out, 250));
-    super (buf);
-    this.out = buf;
+    super((this.out = (out instanceof BufferedOutputStream
+                      ? (BufferedOutputStream) out
+                      : new BufferedOutputStream(out, 250))));
     this.converter = encoder;
   } 
 

diff --git a/libjava/java/io/PrintStream.java b/libjava/java/io/PrintStream.java
index 5f1af28951b989db66fc7c8d9f36b802e32d9a6e..f13d9f318bd4fbb38ebe1eb696ec96c3147de3fb 100644 (file)
--- a/libjava/java/io/PrintStream.java
+++ b/libjava/java/io/PrintStream.java
@@ -238,11 +238,9 @@ public class PrintStream extends FilterOutputStream
 
   public PrintStream (OutputStream out, boolean af)
   {
-    BufferedOutputStream buf = (out instanceof BufferedOutputStream
-                               ? (BufferedOutputStream) out
-                               : new BufferedOutputStream(out, 250));
-    super (buf);
-    this.out = buf;
+    super ((this.out = (out instanceof BufferedOutputStream
+                        ? (BufferedOutputStream) out
+                        : new BufferedOutputStream(out, 250))));
     converter = UnicodeToBytes.getDefaultEncoder();
     error = false;
     auto_flush = af;