RandomAccessFileInputStream.read() should return -1 (EOF) after the

stream is closed

Author: garydgregory

src/changes/changes.xml

@@ -79,6 +79,7 @@ The <action> type attribute can be add,update,fix,remove.
       <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>
+      <action dev="ggregory" type="fix"                due-to="Gary Gregory">RandomAccessFileInputStream.read() should return -1 (EOF) 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>

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

@@ -23,6 +23,7 @@
 import java.io.RandomAccessFile;
 import java.util.Objects;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.RandomAccessFileMode;
 import org.apache.commons.io.build.AbstractOrigin;
 import org.apache.commons.io.build.AbstractStreamBuilder;
@@ -212,7 +213,7 @@ public boolean isCloseOnClose() {
 
     @Override
     public int read() throws IOException {
-        return randomAccessFile.read();
+        return closed ? IOUtils.EOF : randomAccessFile.read();
     }
 
     @Override

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

@@ -33,6 +33,7 @@
 import java.nio.file.Paths;
 import java.nio.file.StandardOpenOption;
 
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.RandomAccessFileMode;
 import org.junit.jupiter.api.Test;
 
@@ -199,6 +200,15 @@ public void testRead() throws IOException {
         }
     }
 
+    @Test
+    public void testReadAfterClose() throws IOException {
+        try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(createRandomAccessFile(),
+            true)) {
+            inputStream.close();
+            assertEquals(IOUtils.EOF, inputStream.read());
+        }
+    }
+
     @Test
     public void testReadByteArray() throws IOException {
         try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(createRandomAccessFile(),