stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8029434: Spliterator of Stream returned by BufferedReader.lines() should have NONNULL characteristic

Browse Source 
Reviewed-by: mduigou
This commit is contained in:
Henry Jen 2013-12-04 08:12:11 -08:00
parent 6c53570dc7
commit 40d9b1af54
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jdk/src/share/classes/java/io/BufferedReader.java
View File

@ -587,6 +587,7 @@ public class BufferedReader extends Reader {
}
}
};
return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iter, Spliterator.ORDERED), false);
return StreamSupport.stream(Spliterators.spliteratorUnknownSize(
iter, Spliterator.ORDERED | Spliterator.NONNULL), false);
}
}

14
jdk/test/java/io/BufferedReader/Lines.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 8003258
* @bug 8003258 8029434
* @run testng Lines
*/
@ -38,6 +38,7 @@ import java.util.Map;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.Spliterator;
import java.util.stream.Stream;
import java.util.concurrent.atomic.AtomicInteger;
import org.testng.annotations.Test;
@ -281,4 +282,15 @@ public class Lines {
// Read after EOL
assertFalse(it.hasNext());
}
public void testCharacteristics() {
try (BufferedReader br = new BufferedReader(
new StringReader(""))) {
Spliterator<String> instance = br.lines().spliterator();
assertTrue(instance.hasCharacteristics(Spliterator.NONNULL));
assertTrue(instance.hasCharacteristics(Spliterator.ORDERED));
} catch (IOException ioe) {
fail("Should not have any exception.");
}
}
}