Merge branch '3.4.x'

wilkinsona · wilkinsona · commit 2dac97a8bc22 · 2025-02-26T15:46:01.000Z
Closes gh-44455
diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemContent.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ssl/pem/PemContent.java
@@ -120,8 +120,8 @@ static PemContent load(String content, ResourceLoader resourceLoader) throws IOE
 		if (isPresentInText(content)) {
 			return new PemContent(content);
 		}
-		try {
-			return load(resourceLoader.getResource(content).getInputStream());
+		try (InputStream in = resourceLoader.getResource(content).getInputStream()) {
+			return load(in);
 		}
 		catch (IOException | UncheckedIOException ex) {
 			throw new IOException("Error reading certificate or key from file '%s'".formatted(content), ex);

Original file line number	Diff line number	Diff line change
`@@ -120,8 +120,8 @@ static PemContent load(String content, ResourceLoader resourceLoader) throws IOE`
`120`	`120`	`if (isPresentInText(content)) {`
`121`	`121`	`return new PemContent(content);`
`122`	`122`	`}`
`123`		`- try {`
`124`		`- return load(resourceLoader.getResource(content).getInputStream());`
	`123`	`+ try (InputStream in = resourceLoader.getResource(content).getInputStream()) {`
	`124`	`+ return load(in);`
`125`	`125`	`}`
`126`	`126`	`catch (IOException \| UncheckedIOException ex) {`
`127`	`127`	`throw new IOException("Error reading certificate or key from file '%s'".formatted(content), ex);`