From 669e91abfa0d4790724c482cc09b2e2c3e593824 Mon Sep 17 00:00:00 2001
From: Michael Koch <konqueror@gmx.de>
Date: Tue, 20 May 2003 11:53:11 +0000
Subject: 2003-05-20  Michael Koch  <konqueror@gmx.de>

	* java/io/DataInputStream.java
	(convertFromUTF): Merged comment from classpath.
	* java/io/PrintStream.java
	(error_occured): Renamed from error, merged comment from classpath.
	(PrintStream): No need to initialized error.
	(checkError): Replace error with error_occurred.
	(setError): Likewise.

From-SVN: r66997
---
 libjava/java/io/PrintStream.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'libjava/java/io/PrintStream.java')

diff --git a/libjava/java/io/PrintStream.java b/libjava/java/io/PrintStream.java
index 418d7f2cbd5..418eea178cd 100644
--- a/libjava/java/io/PrintStream.java
+++ b/libjava/java/io/PrintStream.java
@@ -81,9 +81,12 @@ public class PrintStream extends FilterOutputStream
   // Work buffer of bytes where we temporarily keep converter output.
   byte[] work_bytes = new byte[100];
 
-  // True if error occurred.
-  private boolean error;
-  // True if auto-flush.
+  /**
+   * This boolean indicates whether or not an error has ever occurred
+   * on this stream.
+   */
+  private boolean error_occurred = false;
+
   /**
    * This is <code>true</code> if auto-flush is enabled, 
    * <code>false</code> otherwise
@@ -123,7 +126,6 @@ public class PrintStream extends FilterOutputStream
     super(out);
 
     converter = UnicodeToBytes.getDefaultEncoder();
-    error = false;
     this.auto_flush = auto_flush;
   }
 
@@ -139,7 +141,7 @@ public class PrintStream extends FilterOutputStream
   public boolean checkError ()
   {
     flush();
-    return error;
+    return error_occurred;
   }
 
   /**
@@ -148,7 +150,7 @@ public class PrintStream extends FilterOutputStream
    */
   protected void setError ()
   {
-    error = true;
+    error_occurred = true;
   }
 
   /**
-- 
cgit v1.2.3