+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.
+
2003-05-20 Michael Koch <konqueror@gmx.de>
* java/io/DataInputStream.java:
((long)(buf [7] & 0xff)));
}
+ // FIXME: This method should be re-thought. I suspect we have multiple
+ // UTF-8 decoders floating around. We should use the standard charset
+ // converters, maybe and adding a direct call into one of the new
+ // NIO converters for a super-fast UTF8 decode.
static String convertFromUTF (byte[] buf)
throws EOFException, UTFDataFormatException
{
// 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
super(out);
converter = UnicodeToBytes.getDefaultEncoder();
- error = false;
this.auto_flush = auto_flush;
}
public boolean checkError ()
{
flush();
- return error;
+ return error_occurred;
}
/**
*/
protected void setError ()
{
- error = true;
+ error_occurred = true;
}
/**