spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 20:19:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #51398 from dlwldn30

Browse Source 
Closes gh-51398

* close-aot-file-content-stream:
  Polish "Release file handle when comparing AOT file content"
  Release file handle when comparing AOT file content
This commit is contained in:
Stéphane Nicoll
2026-08-24 08:07:49 +02:00
parent 01267a3c6f 5402f5b43f
commit d3547de07b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot/src/main/java/org/springframework/boot/logging/logback/SpringBootJoranConfigurator.java
+7 -1
View File
@@ -442,7 +442,7 @@ class SpringBootJoranConfigurator extends JoranConfigurator {
if (file.exists()) {
InputStreamSource content = file.getContent();
Assert.state(content != null, "Unable to get file content");
byte[] existingContent = content.getInputStream().readAllBytes();
byte[] existingContent = toByteArray(content);
if (!Arrays.equals(this.newContent, existingContent)) {
throw new IllegalStateException(
"Logging configuration differs from the configuration that has already been written. "
@@ -454,6 +454,12 @@ class SpringBootJoranConfigurator extends JoranConfigurator {
}
}
private byte[] toByteArray(InputStreamSource content) throws IOException {
try (InputStream inputStream = content.getInputStream()) {
return inputStream.readAllBytes();
}
}
}
}