Skip to content

Commit 807e61e

Browse files
authored
CharSequenceReader.skip should return 0 instead of EOF on stream end (#123)
1 parent 821ab5f commit 807e61e

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/main/java/org/apache/commons/io/input/CharSequenceReader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ public long skip(final long n) {
272272
"Number of characters to skip is less than zero: " + n);
273273
}
274274
if (idx >= end()) {
275-
return EOF;
275+
return 0;
276276
}
277277
final int dest = (int)Math.min(end(), idx + n);
278278
final int count = dest - idx;

src/test/java/org/apache/commons/io/input/CharSequenceReaderTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,23 +89,23 @@ public void testSkip() throws IOException {
8989
final Reader reader = new CharSequenceReader("FooBar");
9090
assertEquals(3, reader.skip(3));
9191
checkRead(reader, "Bar");
92-
assertEquals(-1, reader.skip(3));
92+
assertEquals(0, reader.skip(3));
9393
reader.reset();
9494
assertEquals(2, reader.skip(2));
9595
assertEquals(4, reader.skip(10));
96-
assertEquals(-1, reader.skip(1));
96+
assertEquals(0, reader.skip(1));
9797
reader.close();
9898
assertEquals(6, reader.skip(20));
9999
assertEquals(-1, reader.read());
100100

101101
final Reader subReader = new CharSequenceReader("xFooBarx", 1, 7);
102102
assertEquals(3, subReader.skip(3));
103103
checkRead(subReader, "Bar");
104-
assertEquals(-1, subReader.skip(3));
104+
assertEquals(0, subReader.skip(3));
105105
subReader.reset();
106106
assertEquals(2, subReader.skip(2));
107107
assertEquals(4, subReader.skip(10));
108-
assertEquals(-1, subReader.skip(1));
108+
assertEquals(0, subReader.skip(1));
109109
subReader.close();
110110
assertEquals(6, subReader.skip(20));
111111
assertEquals(-1, subReader.read());

0 commit comments

Comments
 (0)