Merge branch '3.4.x' into 3.5.x

Closes gh-47057

Author: wilkinsona

spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/NestedJarFile.java

@@ -706,6 +706,7 @@ private class JarEntryInputStream extends InputStream {
 		JarEntryInputStream(ZipContent.Entry entry) throws IOException {
 			this.uncompressedSize = entry.getUncompressedSize();
 			this.content = entry.openContent();
+			this.remaining = this.uncompressedSize;
 		}
 
 		@Override
@@ -727,9 +728,6 @@ public int read(byte[] b, int off, int len) throws IOException {
 				}
 				result = count;
 			}
-			if (this.remaining == 0) {
-				close();
-			}
 			return result;
 		}
 
@@ -741,9 +739,6 @@ public long skip(long n) throws IOException {
 				this.pos += result;
 				this.remaining -= result;
 			}
-			if (this.remaining == 0) {
-				close();
-			}
 			return result;
 		}
 

spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/NestedJarFileTests.java

@@ -431,6 +431,56 @@ void mismatchedStreamEntriesThrowsException() throws IOException {
 			.hasMessage("Content mismatch when reading security info for entry 'content' (content check)");
 	}
 
+	@Test
+	void readingToEndOfStoredContentCausesAvailableToReachZero() throws IOException {
+		try (NestedJarFile jar = new NestedJarFile(this.file)) {
+			JarEntry entry = jar.getEntry("nested.jar");
+			try (InputStream input = jar.getInputStream(entry)) {
+				assertThat(input.available()).isGreaterThan(0);
+				StreamUtils.copyToByteArray(input);
+				assertThat(input.available()).isZero();
+			}
+		}
+	}
+
+	@Test
+	void readingToEndOfDeflatedContentCausesAvailableToReachZero() throws IOException {
+		try (NestedJarFile jar = new NestedJarFile(this.file)) {
+			JarEntry entry = jar.getEntry("d/9.dat");
+			try (InputStream input = jar.getInputStream(entry)) {
+				assertThat(input.available()).isGreaterThan(0);
+				StreamUtils.copyToByteArray(input);
+				assertThat(input.available()).isZero();
+			}
+		}
+	}
+
+	@Test
+	void skippingBeyondEndOfStoredContentCausesAvailableToReachZero() throws IOException {
+		try (NestedJarFile jar = new NestedJarFile(this.file)) {
+			JarEntry entry = jar.getEntry("nested.jar");
+			try (InputStream input = jar.getInputStream(entry)) {
+				assertThat(input.available()).isGreaterThan(0);
+				long skipped = input.skip(1000);
+				assertThat(skipped).isLessThan(1000);
+				assertThat(input.available()).isZero();
+			}
+		}
+	}
+
+	@Test
+	void skippingBeyondEndOfDeflatedContentCausesAvailableToReachZero() throws IOException {
+		try (NestedJarFile jar = new NestedJarFile(this.file)) {
+			JarEntry entry = jar.getEntry("d/9.dat");
+			try (InputStream input = jar.getInputStream(entry)) {
+				assertThat(input.available()).isGreaterThan(0);
+				long skipped = input.skip(1000);
+				assertThat(skipped).isLessThan(1000);
+				assertThat(input.available()).isZero();
+			}
+		}
+	}
+
 	private List<String> collectComments(JarFile jarFile) throws IOException {
 		try (jarFile) {
 			List<String> comments = new ArrayList<>();