This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-io.git
The following commit(s) were added to refs/heads/master by this push:
new 46ab253 [IO-458] Add a SequenceReader similar to
java.io.SequenceInputStream.
46ab253 is described below
commit 46ab2532070e129ac54508bfb7a5be33a6b797bc
Author: Gary Gregory <[email protected]>
AuthorDate: Mon Dec 23 10:13:47 2019 -0500
[IO-458] Add a SequenceReader similar to java.io.SequenceInputStream.
Refactor commmon code in a private method.
---
src/main/java/org/apache/commons/io/input/SequenceReader.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/apache/commons/io/input/SequenceReader.java
b/src/main/java/org/apache/commons/io/input/SequenceReader.java
index a38f275..b8d6599 100644
--- a/src/main/java/org/apache/commons/io/input/SequenceReader.java
+++ b/src/main/java/org/apache/commons/io/input/SequenceReader.java
@@ -41,7 +41,7 @@ public class SequenceReader extends Reader {
*/
public SequenceReader(final Iterable<? extends Reader> readers) {
this.readers = Objects.requireNonNull(readers, "readers").iterator();
- this.reader = this.readers.hasNext() ? this.readers.next() : null;
+ this.reader = nextReader();
}
/**
@@ -64,6 +64,10 @@ public class SequenceReader extends Reader {
this.reader = null;
}
+ private Reader nextReader() {
+ return this.readers.hasNext() ? this.readers.next() : null;
+ }
+
/*
* (non-Javadoc)
*
@@ -75,7 +79,7 @@ public class SequenceReader extends Reader {
while (reader != null) {
c = reader.read();
if (c == EOF) {
- reader = readers.hasNext() ? readers.next() : null;
+ reader = nextReader();
} else {
break;
}
@@ -98,7 +102,7 @@ public class SequenceReader extends Reader {
while (reader != null) {
final int readLen = reader.read(cbuf, off, len);
if (readLen == EOF) {
- reader = readers.hasNext() ? readers.next() : null;
+ reader = nextReader();
} else {
count += readLen;
off += readLen;