You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/07/08 22:34:59 UTC
(commons-io) 03/06: RandomAccessFileInputStream.available() should return 0 after the stream is closed
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
commit c3a92cb05cff5115f0d70d11ad3db95607b2a21f
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jul 8 18:27:12 2024 -0400
RandomAccessFileInputStream.available() should return 0 after the stream
is closed
---
src/changes/changes.xml | 1 +
.../apache/commons/io/input/RandomAccessFileInputStream.java | 4 +++-
.../commons/io/input/RandomAccessFileInputStreamTest.java | 11 ++++++++++-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 5971bcce2..635fc8b24 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -78,6 +78,7 @@ The <action> type attribute can be add,update,fix,remove.
<action dev="ggregory" type="fix" due-to="Gary Gregory">MemoryMappedFileInputStream.available() should return 0 after the stream is closed.</action>
<action dev="ggregory" type="fix" due-to="Gary Gregory">MemoryMappedFileInputStream.read() should return -1 after the stream is closed.</action>
<action dev="ggregory" type="fix" due-to="Gary Gregory">ProxyInputStream.read() should return -1 after the stream is closed.</action>
+ <action dev="ggregory" type="fix" due-to="Gary Gregory">RandomAccessFileInputStream.available() should return 0 after the stream is closed.</action>
<!-- UPDATE -->
<action dev="ggregory" type="update" due-to="Dependabot">Bump tests commons.bytebuddy.version from 1.14.13 to 1.14.17 #615, #621, #631, #635.</action>
<action dev="ggregory" type="update" due-to="Dependabot">Bump tests commons-codec:commons-codec from 1.16.1 to 1.17.0.</action>
diff --git a/src/main/java/org/apache/commons/io/input/RandomAccessFileInputStream.java b/src/main/java/org/apache/commons/io/input/RandomAccessFileInputStream.java
index c23b62b2c..77aea3f6e 100644
--- a/src/main/java/org/apache/commons/io/input/RandomAccessFileInputStream.java
+++ b/src/main/java/org/apache/commons/io/input/RandomAccessFileInputStream.java
@@ -128,6 +128,7 @@ public class RandomAccessFileInputStream extends InputStream {
return new Builder();
}
+ private boolean closed;
private final boolean propagateClose;
private final RandomAccessFile randomAccessFile;
@@ -179,7 +180,7 @@ public class RandomAccessFileInputStream extends InputStream {
* @throws IOException If an I/O error occurs.
*/
public long availableLong() throws IOException {
- return randomAccessFile.length() - randomAccessFile.getFilePointer();
+ return closed ? 0 : randomAccessFile.length() - randomAccessFile.getFilePointer();
}
@Override
@@ -188,6 +189,7 @@ public class RandomAccessFileInputStream extends InputStream {
if (propagateClose) {
randomAccessFile.close();
}
+ closed = true;
}
/**
diff --git a/src/test/java/org/apache/commons/io/input/RandomAccessFileInputStreamTest.java b/src/test/java/org/apache/commons/io/input/RandomAccessFileInputStreamTest.java
index 0892d3a70..3d1ee1407 100644
--- a/src/test/java/org/apache/commons/io/input/RandomAccessFileInputStreamTest.java
+++ b/src/test/java/org/apache/commons/io/input/RandomAccessFileInputStreamTest.java
@@ -47,13 +47,22 @@ public class RandomAccessFileInputStreamTest {
}
@Test
- public void testAvailable() throws IOException {
+ public void testAvailableAfterOpen() throws IOException {
try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(createRandomAccessFile(),
true)) {
assertEquals(DATA_FILE_LEN, inputStream.available());
}
}
+ @Test
+ public void testAvailableAfterClose() throws IOException {
+ try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(createRandomAccessFile(),
+ true)) {
+ inputStream.close();
+ assertEquals(0, inputStream.available());
+ }
+ }
+
@Test
public void testAvailableLong() throws IOException {
try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(createRandomAccessFile(),