Skip to content

Commit c74f241

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents b34ea84 + 9248954 commit c74f241

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

src/main/java/org/apache/commons/io/channels/ByteArraySeekableByteChannel.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ public ByteArraySeekableByteChannel() {
8686

8787
private ByteArraySeekableByteChannel(final byte[] data) {
8888
this.data = data;
89-
this.position = 0;
9089
this.size = data.length;
9190
}
9291

@@ -104,8 +103,6 @@ public ByteArraySeekableByteChannel(final int size) {
104103
throw new IllegalArgumentException("Size must be non-negative");
105104
}
106105
this.data = new byte[size];
107-
this.position = 0;
108-
this.size = 0;
109106
}
110107

111108
/**

src/test/java/org/apache/commons/io/build/AbstractStreamBuilderTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import static org.junit.jupiter.api.Assertions.assertTrue;
2525

2626
import java.io.FileInputStream;
27+
import java.io.InputStream;
2728
import java.io.RandomAccessFile;
2829
import java.net.URI;
2930
import java.net.URISyntaxException;
@@ -118,7 +119,7 @@ void testBufferSizeChecker() {
118119
}
119120

120121
/**
121-
* Tests various ways to obtain a {@link java.io.InputStream}.
122+
* Tests various ways to obtain a {@link InputStream}.
122123
*
123124
* @param configurer Lambda to configure the builder.
124125
*/

0 commit comments

Comments
 (0)