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

27
src/java.base/share/classes/java/io/PushbackReader.java
View file

@ -25,6 +25,7 @@
package java.io;
import java.util.Objects;
/**
* A character-stream reader that allows characters to be pushed back into the
@ -92,28 +93,14 @@ public class PushbackReader extends FilterReader {
}
/**
* Reads characters into a portion of an array.
*
* @param cbuf Destination buffer
* @param off Offset at which to start writing characters
* @param len Maximum number of characters to read
*
* @return The number of characters read, or -1 if the end of the
* stream has been reached
*
* @throws IOException If an I/O error occurs
* @throws IndexOutOfBoundsException {@inheritDoc}
* {@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();
try {
if (len <= 0) {
if (len < 0) {
throw new IndexOutOfBoundsException();
} else if ((off < 0) || (off > cbuf.length)) {
throw new IndexOutOfBoundsException();
}
Objects.checkFromIndexSize(off, len, cbuf.length);
if (len == 0) {
return 0;
}
int avail = buf.length - pos;
@ -172,7 +159,7 @@ public class PushbackReader extends FilterReader {
* @throws IOException If there is insufficient room in the pushback
* buffer, or if some other I/O error occurs
*/
public void unread(char cbuf[], int off, int len) throws IOException {
public void unread(char[] cbuf, int off, int len) throws IOException {
synchronized (lock) {
ensureOpen();
if (len > pos)
@ -193,7 +180,7 @@ public class PushbackReader extends FilterReader {
* @throws IOException If there is insufficient room in the pushback
* buffer, or if some other I/O error occurs
*/
public void unread(char cbuf[]) throws IOException {
public void unread(char[] cbuf) throws IOException {
unread(cbuf, 0, cbuf.length);
}