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

8235668: LineNumberReader#getLineNumber() returns wrong line number (one fewer) in Lucene test

Browse source 
Reviewed-by: alanb, rriggs
This commit is contained in:
Brian Burkhalter 2019-12-12 13:43:07 -08:00
parent dbd4134c04
commit 7cdecd8981
3 changed files with 8 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -302,8 +302,6 @@ public class BufferedReader extends Reader {
* (EOF).
*
* @param ignoreLF If true, the next '\n' will be skipped
* @param term Output: Whether a line terminator was encountered
* while reading the line; may be {@code null}.
*
* @return A String containing the contents of the line, not including
* any line-termination characters, or null if the end of the
@ -313,14 +311,13 @@ public class BufferedReader extends Reader {
*
* @throws IOException If an I/O error occurs
*/
String readLine(boolean ignoreLF, boolean[] term) throws IOException {
String readLine(boolean ignoreLF) throws IOException {
StringBuilder s = null;
int startChar;
synchronized (lock) {
ensureOpen();
boolean omitLF = ignoreLF || skipLF;
if (term != null) term[0] = false;
bufferLoop:
for (;;) {
@ -347,7 +344,6 @@ public class BufferedReader extends Reader {
for (i = nextChar; i < nChars; i++) {
c = cb[i];
if ((c == '\n') || (c == '\r')) {
if (term != null) term[0] = true;
eol = true;
break charLoop;
}
@ -393,7 +389,7 @@ public class BufferedReader extends Reader {
* @see java.nio.file.Files#readAllLines
*/
public String readLine() throws IOException {
return readLine(false, null);
return readLine(false);
}
/**

6
src/java.base/share/classes/java/io/LineNumberReader.java
View file

@ -25,6 +25,7 @@
package java.io;
/**
* A buffered character-input stream that keeps track of line numbers. This
* class defines methods {@link #setLineNumber(int)} and {@link
@ -199,10 +200,9 @@ public class LineNumberReader extends BufferedReader {
*/
public String readLine() throws IOException {
synchronized (lock) {
boolean[] term = new boolean[1];
String l = super.readLine(skipLF, term);
String l = super.readLine(skipLF);
skipLF = false;
if (l != null && term[0])
if (l != null)
lineNumber++;
return l;
}