From: Tom Tromey <tromey@cygnus.com>
Date: Tue, 21 Sep 1999 21:35:41 +0000 (+0000)
Subject: OutputStreamWriter.java (OutputStreamWriter): Reverted previous patch; it too was... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=49d385e3cdad24f2a31a10372e448299dff5eec0;p=gcc.git

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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9c632ef968f..6ce5ae0dfb2 100644
--- 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 310c3d6ece5..88841d9c1b4 100644
--- 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 5f1af28951b..f13d9f318bd 100644
--- 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;