From f7127e55225840681224dc55eecb144d12369352 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 23 May 2017 20:42:59 +0100 Subject: [PATCH] Ensure that closing a JarFile closes all underlying resources Closes gh-8871 --- .../org/springframework/boot/loader/jar/JarFile.java | 1 + .../springframework/boot/loader/jar/JarFileTests.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java index 9c6bf000611..f6e17269846 100644 --- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java +++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/JarFile.java @@ -298,6 +298,7 @@ public class JarFile extends java.util.jar.JarFile { @Override public void close() throws IOException { + super.close(); this.rootFile.close(); } diff --git a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java index d9e29934004..c4e5e791048 100644 --- a/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java +++ b/spring-boot-tools/spring-boot-loader/src/test/java/org/springframework/boot/loader/jar/JarFileTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2016 the original author or authors. + * Copyright 2012-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -469,4 +469,13 @@ public class JarFileTests { } } + @Test + public void jarFileCanBeDeletedOnceItHasBeenClosed() throws Exception { + File temp = this.temporaryFolder.newFile(); + TestJarCreator.createTestJar(temp); + JarFile jf = new JarFile(temp); + jf.close(); + assertThat(temp.delete()).isTrue(); + } + }