ProxyInputStream.read() should return -1 after the stream is closed

Author: garydgregory

src/changes/changes.xml

@@ -77,6 +77,7 @@ The <action> type attribute can be add,update,fix,remove.
       <action dev="ggregory" type="fix"                due-to="Gary Gregory">NullInputStream.read() should return -1 after the stream is closed.</action>
       <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>
       <!-- 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/ProxyInputStream.java

@@ -180,13 +180,16 @@ public boolean markSupported() {
     }
 
     /**
-     * Invokes the delegate's {@code read()} method.
+     * Invokes the delegate's {@code read()} method unless the stream is closed.
      *
      * @return the byte read or -1 if the end of stream
      * @throws IOException if an I/O error occurs.
      */
     @Override
     public int read() throws IOException {
+        if (isClosed()) {
+            return EOF;
+        }
         try {
             beforeRead(1);
             final int b = in.read();

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

@@ -24,6 +24,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
 import org.apache.commons.io.IOUtils;
@@ -66,6 +67,13 @@ public void testAvailableAfterClose() throws IOException {
         assertEquals(0, shadow.available());
     }
 
+    @Test
+    public void testAvailableAfterOpen() throws IOException {
+        try (T inputStream = createFixture()) {
+            assertEquals(3, inputStream.available());
+        }
+    }
+
     @Test
     public void testAvailableAll() throws IOException {
         try (T inputStream = createFixture()) {
@@ -110,8 +118,12 @@ public void testRead() throws IOException {
     @SuppressWarnings("resource")
     @Test
     public void testReadAfterClose() throws IOException {
-        final T shadow;
-        try (T inputStream = createFixture()) {
+        InputStream shadow;
+        try (InputStream inputStream = createFixture()) {
+            shadow = inputStream;
+        }
+        assertEquals(IOUtils.EOF, shadow.read());
+        try (InputStream inputStream = new ProxyInputStreamFixture(new ByteArrayInputStream("abc".getBytes(StandardCharsets.UTF_8)))) {
             shadow = inputStream;
         }
         assertEquals(IOUtils.EOF, shadow.read());