diff options
| author | Tom Tromey <tromey@cygnus.com> | 1999-09-21 21:35:41 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 1999-09-21 21:35:41 +0000 |
| commit | 49d385e3cdad24f2a31a10372e448299dff5eec0 (patch) | |
| tree | 3a18c5f14dc1ef3f4034992f423e80c8642948df /libjava | |
| parent | 336a6399a9ab84ac787c525ec2a2a469b8b488d5 (diff) | |
| download | gcc-49d385e3cdad24f2a31a10372e448299dff5eec0.zip gcc-49d385e3cdad24f2a31a10372e448299dff5eec0.tar.gz gcc-49d385e3cdad24f2a31a10372e448299dff5eec0.tar.bz2 | |
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
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 4 | ||||
| -rw-r--r-- | libjava/java/io/OutputStreamWriter.java | 8 | ||||
| -rw-r--r-- | libjava/java/io/PrintStream.java | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 9c632ef..6ce5ae0 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 310c3d6..88841d9 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 5f1af28..f13d9f3 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; |