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

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

From-SVN: r29566

libjava/ChangeLog

 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'

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;
   } 
 

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;