Test fix for ReadAheadInputStream now restores the current thread's

interrupt flag when catching InterruptedException.

Author: garydgregory

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

@@ -294,8 +294,7 @@ public void close() throws IOException {
         }
         if (shutdownExecutorService) {
             try {
-                executorService.shutdownNow();
-                executorService.awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS);
+                shutdownAwait();
             } catch (final InterruptedException e) {
                 Thread.currentThread().interrupt();
                 throw Input.toInterruptedIOException(e);
@@ -464,6 +463,11 @@ private void readAsync() throws IOException {
         });
     }
 
+    boolean shutdownAwait() throws InterruptedException {
+        executorService.shutdownNow();
+        return executorService.awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS);
+    }
+
     private void signalAsyncReadComplete() {
         stateChangeLock.lock();
         try {

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

@@ -18,17 +18,24 @@
 package org.apache.commons.io.input;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertInstanceOf;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
 
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InterruptedIOException;
 import java.nio.file.StandardOpenOption;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 
 /**
  * Tests {@link ReadAheadInputStream}. This class was ported and adapted from Apache Spark commit 933dc6cb7b3de1d8ccaf73d124d6eb95b947ed19 where it was called
@@ -64,6 +71,22 @@ void setUpInputStreams() throws IOException {
                 ReadAheadInputStream.builder().setPath(InputPath).setOpenOptions(StandardOpenOption.READ).get() };
     }
 
+    @Test
+    @Timeout(value = 5, unit = TimeUnit.SECONDS)
+    synchronized void testCloseInterrupt() throws IOException, InterruptedException {
+        try (ReadAheadInputStream inputStream = ReadAheadInputStream.builder()
+                // @formatter:off
+                .setPath(InputPath)
+                .get()) {
+                // @formatter:on
+            final ReadAheadInputStream spy = spy(inputStream);
+            when(spy.shutdownAwait()).thenThrow(InterruptedException.class);
+            Thread.currentThread().interrupt();
+            assertInstanceOf(InterruptedException.class, assertThrows(InterruptedIOException.class, spy::close).getCause());
+            assertTrue(Thread.interrupted());
+        }
+    }
+
     @Test
     void testClosePlusExecutorService() throws IOException {
         final ExecutorService externalExecutor = Executors.newSingleThreadExecutor();
@@ -82,4 +105,5 @@ void testClosePlusExecutorService() throws IOException {
             }
         }
     }
+
 }