diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/zip/FileChannelDataBlock.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/zip/FileChannelDataBlock.java
index 0346a87d4d0..788841ea308 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/zip/FileChannelDataBlock.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/zip/FileChannelDataBlock.java
@@ -179,15 +179,7 @@ class FileChannelDataBlock implements CloseableDataBlock {
 		int read(ByteBuffer dst, long position) throws IOException {
 			synchronized (this.lock) {
 				if (position < this.bufferPosition || position >= this.bufferPosition + this.bufferSize) {
-					this.buffer.clear();
-					try {
-						this.bufferSize = this.fileChannel.read(this.buffer, position);
-					}
-					catch (ClosedByInterruptException ex) {
-						repairFileChannel();
-						throw ex;
-					}
-					this.bufferPosition = position;
+					fillBuffer(position);
 				}
 				if (this.bufferSize <= 0) {
 					return this.bufferSize;
@@ -200,6 +192,27 @@ class FileChannelDataBlock implements CloseableDataBlock {
 			}
 		}
 
+		private void fillBuffer(long position) throws IOException {
+			for (int i = 0; i < 10; i++) {
+				boolean interrupted = (i != 0) ? Thread.interrupted() : false;
+				try {
+					this.buffer.clear();
+					this.bufferSize = this.fileChannel.read(this.buffer, position);
+					this.bufferPosition = position;
+					return;
+				}
+				catch (ClosedByInterruptException ex) {
+					repairFileChannel();
+				}
+				finally {
+					if (interrupted) {
+						Thread.currentThread().interrupt();
+					}
+				}
+			}
+			throw new ClosedByInterruptException();
+		}
+
 		private void repairFileChannel() throws IOException {
 			if (tracker != null) {
 				tracker.closedFileChannel(this.path, this.fileChannel);
diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/zip/FileChannelDataBlockTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/zip/FileChannelDataBlockTests.java
index df015ff68d5..b5abefc6aad 100644
--- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/zip/FileChannelDataBlockTests.java
+++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/zip/FileChannelDataBlockTests.java
@@ -19,11 +19,9 @@ package org.springframework.boot.loader.zip;
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.nio.channels.ClosedByInterruptException;
 import java.nio.channels.FileChannel;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -77,25 +75,16 @@ class FileChannelDataBlockTests {
 	}
 
 	@Test
-	void readReadsFileWhenAnotherThreadHasBeenInterrupted() throws IOException, InterruptedException {
+	void readReadsFileWhenThreadHasBeenInterrupted() throws IOException {
 		try (FileChannelDataBlock block = createAndOpenBlock()) {
 			ByteBuffer buffer = ByteBuffer.allocate(CONTENT.length);
-			AtomicReference<IOException> failure = new AtomicReference<>();
-			Thread thread = new Thread(() -> {
-				Thread.currentThread().interrupt();
-				try {
-					block.read(ByteBuffer.allocate(CONTENT.length), 0);
-				}
-				catch (IOException ex) {
-					failure.set(ex);
-				}
-			});
-			thread.start();
-			thread.join();
-			assertThat(failure.get()).isInstanceOf(ClosedByInterruptException.class);
+			Thread.currentThread().interrupt();
 			assertThat(block.read(buffer, 0)).isEqualTo(6);
 			assertThat(buffer.array()).containsExactly(CONTENT);
 		}
+		finally {
+			Thread.interrupted();
+		}
 	}
 
 	@Test