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-compress.git
commit 6a5d4ba3b4326b3ccd26b431af64e73f59301ec8 Author: Gary Gregory <[email protected]> AuthorDate: Fri May 17 10:26:06 2024 -0400 Better internal name --- .../utils/MultiReadOnlySeekableByteChannel.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/apache/commons/compress/utils/MultiReadOnlySeekableByteChannel.java b/src/main/java/org/apache/commons/compress/utils/MultiReadOnlySeekableByteChannel.java index c6e02c2e2..e7bcae73f 100644 --- a/src/main/java/org/apache/commons/compress/utils/MultiReadOnlySeekableByteChannel.java +++ b/src/main/java/org/apache/commons/compress/utils/MultiReadOnlySeekableByteChannel.java @@ -99,7 +99,7 @@ public class MultiReadOnlySeekableByteChannel implements SeekableByteChannel { return new MultiReadOnlySeekableByteChannel(Arrays.asList(channels)); } - private final List<SeekableByteChannel> channels; + private final List<SeekableByteChannel> channelList; private long globalPosition; @@ -112,13 +112,13 @@ public class MultiReadOnlySeekableByteChannel implements SeekableByteChannel { * @throws NullPointerException if channels is null */ public MultiReadOnlySeekableByteChannel(final List<SeekableByteChannel> channels) { - this.channels = Collections.unmodifiableList(new ArrayList<>(Objects.requireNonNull(channels, "channels"))); + this.channelList = Collections.unmodifiableList(new ArrayList<>(Objects.requireNonNull(channels, "channels"))); } @Override public void close() throws IOException { IOException first = null; - for (final SeekableByteChannel ch : channels) { + for (final SeekableByteChannel ch : channelList) { try { ch.close(); } catch (final IOException ex) { @@ -134,7 +134,7 @@ public class MultiReadOnlySeekableByteChannel implements SeekableByteChannel { @Override public boolean isOpen() { - return channels.stream().allMatch(SeekableByteChannel::isOpen); + return channelList.stream().allMatch(SeekableByteChannel::isOpen); } /** @@ -159,8 +159,8 @@ public class MultiReadOnlySeekableByteChannel implements SeekableByteChannel { } globalPosition = newPosition; long pos = newPosition; - for (int i = 0; i < channels.size(); i++) { - final SeekableByteChannel currentChannel = channels.get(i); + for (int i = 0; i < channelList.size(); i++) { + final SeekableByteChannel currentChannel = channelList.get(i); final long size = currentChannel.size(); final long newChannelPos; @@ -200,7 +200,7 @@ public class MultiReadOnlySeekableByteChannel implements SeekableByteChannel { } long globalPosition = relativeOffset; for (int i = 0; i < channelNumber; i++) { - globalPosition += channels.get(i).size(); + globalPosition += channelList.get(i).size(); } return position(globalPosition); @@ -216,8 +216,8 @@ public class MultiReadOnlySeekableByteChannel implements SeekableByteChannel { } int totalBytesRead = 0; - while (dst.hasRemaining() && currentChannelIdx < channels.size()) { - final SeekableByteChannel currentChannel = channels.get(currentChannelIdx); + while (dst.hasRemaining() && currentChannelIdx < channelList.size()) { + final SeekableByteChannel currentChannel = channelList.get(currentChannelIdx); final int newBytesRead = currentChannel.read(dst); if (newBytesRead == -1) { // EOF for this channel -- advance to next channel idx @@ -243,7 +243,7 @@ public class MultiReadOnlySeekableByteChannel implements SeekableByteChannel { throw new ClosedChannelException(); } long acc = 0; - for (final SeekableByteChannel ch : channels) { + for (final SeekableByteChannel ch : channelList) { acc += ch.size(); } return acc;
