jdk-sandbox: comparison src/java.base/share/classes/java/io/BufferedReader.java

equal deleted inserted replaced

-:e2de6e166880
+:e64fec9f1773
 /*
-* Copyright (c) 1996, 2017, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1996, 2019, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 * of a line feed ('\n'), a carriage return ('\r'), a carriage return
 * followed immediately by a line feed, or by reaching the end-of-file
 * (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
 *             stream has been reached without reading any characters
 *
 * @see        java.io.LineNumberReader#readLine()
 *
 * @exception  IOException  If an I/O error occurs
 */
-String readLine(boolean ignoreLF) throws IOException {
+String readLine(boolean ignoreLF, boolean[] term) throws IOException {
 StringBuffer s = null;
 int startChar;
 synchronized (lock) {
 ensureOpen();
 boolean omitLF = ignoreLF || skipLF;
+if (term != null) term[0] = false;
 bufferLoop:
 for (;;) {
 if (nextChar >= nChars)
 charLoop:
 for (i = nextChar; i < nChars; i++) {
 c = cb[i];
 if ((c == '\n') || (c == '\r')) {
+if (term != null) term[0] = true;
 eol = true;
 break charLoop;
 }
 }
 * @exception  IOException  If an I/O error occurs
 *
 * @see java.nio.file.Files#readAllLines
 */
 public String readLine() throws IOException {
-return readLine(false);
+return readLine(false, null);
 }
 /**
 * Skips characters.
 *

changeset 58089	e64fec9f1773
parent 47216	71c04702a3d5
child 58242	94bb65cb37d3