procyberian/gcc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BufferedOutputStream.java: Re-merged with Classpath.

Browse source 
* java/io/BufferedOutputStream.java: Re-merged with Classpath.
	* java/io/CharConversionException.java: Likewise.
	* java/io/EOFException.java: Likewise.
	* java/io/FileNotFoundException.java: Likewise.
	* java/io/IOException.java: Likewise.
	* java/io/InterruptedIOException.java: Likewise.
	* java/io/InvalidClassException.java: Likewise.
	* java/io/InvalidObjectException.java: Likewise.
	* java/io/NotActiveException.java: Likewise.
	* java/io/NotSerializableException.java: Likewise.
	* java/io/ObjectStreamException.java: Likewise.
	* java/io/ObjectStreamConstants.java: Likewise.
	* java/io/OptionalDataException.java: Likewise.
	* java/io/PipedInputStream.java: Likewise.
	* java/io/PushbackInputStream.java: Likewise.
	* java/io/StreamCorruptedException.java: Likewise.
	* java/io/SyncFailedException.java: Likewise.
	* java/io/UTFDataFormatException.java: Likewise.
	* java/io/UnsupportedEncodingException.java: Likewise.
	* java/io/WriteAbortedException.java: Likewise.

From-SVN: r54655
This commit is contained in:
Tom Tromey 2002-06-15 18:59:15 +00:00 • committed by Tom Tromey
parent 945dabcd7a
commit 34442f32a2
21 changed files with 598 additions and 709 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libjava/java/io/PushbackInputStream.java
View file

@ -201,6 +201,7 @@ public class PushbackInputStream extends FilterInputStream
public synchronized int read(byte[] b, int off, int len) throws IOException
{
int numBytes = Math.min(buf.length - pos, len);
if (numBytes > 0)
{
System.arraycopy (buf, pos, b, off, numBytes);
@ -209,10 +210,10 @@ public class PushbackInputStream extends FilterInputStream
off += numBytes;
}
if (len > 0)
if (len > 0)
{
len = super.read(b, off, len);
if (len == -1) // EOF
if (len == -1) //EOF
return numBytes > 0 ? numBytes : -1;
numBytes += len;
}
@ -318,7 +319,8 @@ public class PushbackInputStream extends FilterInputStream
int numread = (int) Math.min((long) (buf.length - pos), n);
pos += numread;
n -= numread;
n -= super.skip(n);
if (n > 0)
n -= super.skip(n);
}
return origN - n;