From dbbde18d4175d4f57a139050d4a6aa165151ad9e Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 8 Nov 2023 07:02:35 -0800 Subject: [PATCH] Attempt to fix Windows build failure due to open files See gh-38204 --- .../net/protocol/jar/JarUrlConnectionTests.java | 10 ++++++++-- .../net/protocol/nested/NestedUrlConnectionTests.java | 11 ++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/jar/JarUrlConnectionTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/jar/JarUrlConnectionTests.java index aa91510356..c9553c7313 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/jar/JarUrlConnectionTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/jar/JarUrlConnectionTests.java @@ -502,8 +502,14 @@ class JarUrlConnectionTests { void getLastModifiedHeaderReturnsFileModifiedTime() throws IOException { JarUrlConnection connection = JarUrlConnection.open(this.url); URLConnection fileConnection = this.file.toURI().toURL().openConnection(); - assertThat(connection.getHeaderFieldDate("last-modified", 0)).isEqualTo(withoutNanos(this.file.lastModified())) - .isEqualTo(fileConnection.getHeaderFieldDate("last-modified", 0)); + try { + assertThat(connection.getHeaderFieldDate("last-modified", 0)) + .isEqualTo(withoutNanos(this.file.lastModified())) + .isEqualTo(fileConnection.getHeaderFieldDate("last-modified", 0)); + } + finally { + fileConnection.getInputStream().close(); + } } private long withoutNanos(long epochMilli) { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/nested/NestedUrlConnectionTests.java b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/nested/NestedUrlConnectionTests.java index 488a168523..c3a8d8aa56 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/nested/NestedUrlConnectionTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/net/protocol/nested/NestedUrlConnectionTests.java @@ -162,9 +162,14 @@ class NestedUrlConnectionTests { void getLastModifiedHeaderReturnsFileModifiedTime() throws IOException { NestedUrlConnection connection = new NestedUrlConnection(this.url); URLConnection fileConnection = this.jarFile.toURI().toURL().openConnection(); - assertThat(connection.getHeaderFieldDate("last-modified", 0)) - .isEqualTo(withoutNanos(this.jarFile.lastModified())) - .isEqualTo(fileConnection.getHeaderFieldDate("last-modified", 0)); + try { + assertThat(connection.getHeaderFieldDate("last-modified", 0)) + .isEqualTo(withoutNanos(this.jarFile.lastModified())) + .isEqualTo(fileConnection.getHeaderFieldDate("last-modified", 0)); + } + finally { + fileConnection.getInputStream().close(); + } } private long withoutNanos(long epochMilli) {