archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8258444: Clean up specifications of java.io.Reader.read(char[],int,int) in subclass overrides

Browse source 
Reviewed-by: alanb, rriggs
This commit is contained in:
Brian Burkhalter 2021-02-25 16:22:59 +00:00
parent 7d4f60b16b
commit 5a9b70103c
9 changed files with 101 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/java.base/share/classes/java/io/BufferedReader.java
View file

@ -28,6 +28,7 @@ package java.io;
import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.Objects;
import java.util.Spliterator;
import java.util.Spliterators;
import java.util.stream.Stream;
@ -71,7 +72,7 @@ public class BufferedReader extends Reader {
private Reader in;
private char cb[];
private char[] cb;
private int nChars, nextChar;
private static final int INVALIDATED = -2;
@ -146,7 +147,7 @@ public class BufferedReader extends Reader {
dst = delta;
} else {
/* Reallocate buffer to accommodate read-ahead limit */
char ncb[] = new char[readAheadLimit];
char[] ncb = new char[readAheadLimit];
System.arraycopy(cb, markedChar, ncb, 0, delta);
cb = ncb;
markedChar = 0;
@ -237,7 +238,8 @@ public class BufferedReader extends Reader {
* attempts to read as many characters as possible by repeatedly invoking
* the {@code read} method of the underlying stream. This iterated
* {@code read} continues until one of the following conditions becomes
* true: <ul>
* true:
* <ul>
*
* <li> The specified number of characters have been read,
*
@ -248,7 +250,8 @@ public class BufferedReader extends Reader {
* returns {@code false}, indicating that further input requests
* would block.
*
* </ul> If the first {@code read} on the underlying stream returns
* </ul>
* If the first {@code read} on the underlying stream returns
* {@code -1} to indicate end-of-file then this method returns
* {@code -1}. Otherwise this method returns the number of characters
* actually read.
@ -264,23 +267,20 @@ public class BufferedReader extends Reader {
* Thus redundant {@code BufferedReader}s will not copy data
* unnecessarily.
*
* @param cbuf Destination buffer
* @param off Offset at which to start storing characters
* @param len Maximum number of characters to read
* @param cbuf {@inheritDoc}
* @param off {@inheritDoc}
* @param len {@inheritDoc}
*
* @return The number of characters read, or -1 if the end of the
* stream has been reached
* @return {@inheritDoc}
*
* @throws IOException If an I/O error occurs
* @throws IndexOutOfBoundsException {@inheritDoc}
* @throws IOException {@inheritDoc}
*/
public int read(char cbuf[], int off, int len) throws IOException {
public int read(char[] cbuf, int off, int len) throws IOException {
synchronized (lock) {
ensureOpen();
if ((off < 0) || (off > cbuf.length) || (len < 0) ||
((off + len) > cbuf.length) || ((off + len) < 0)) {
throw new IndexOutOfBoundsException();
} else if (len == 0) {
Objects.checkFromIndexSize(off, len, cbuf.length);
if (len == 0) {
return 0;
}