Let FileDownloader implement AutoClosable

2 files changed, 2 insertions, 5 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
index 9ab65be7dab..36c36353889 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ApplicationPackageMaintainer.java
@@ -51,8 +51,7 @@ public class ApplicationPackageMaintainer extends ConfigServerMaintainer {
     protected void maintain() {
         if (! distributeApplicationPackage.value()) return;
 
-        var fileDownloader =  new FileDownloader(createConnectionPool(configserverConfig), downloadDirectory);
-        try {
+        try (var fileDownloader = new FileDownloader(createConnectionPool(configserverConfig), downloadDirectory)){
             for (var applicationId : applicationRepository.listApplications()) {
                 RemoteSession session = applicationRepository.getActiveSession(applicationId);
                 FileReference applicationPackage = session.getApplicationPackageReference();
@@ -65,8 +64,6 @@ public class ApplicationPackageMaintainer extends ConfigServerMaintainer {
                     }
                 }
             }
-        } finally {
-            fileDownloader.close();
         }
     }
 
diff --git a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
index 739f24bb8a2..67fcff2224b 100644
--- a/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
+++ b/filedistribution/src/main/java/com/yahoo/vespa/filedistribution/FileDownloader.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
  *
  * @author hmusum
  */
-public class FileDownloader {
+public class FileDownloader implements AutoCloseable {
 
     private final static Logger log = Logger.getLogger(FileDownloader.class.getName());
     public static File defaultDownloadDirectory = new File(Defaults.getDefaults().underVespaHome("var/db/vespa/filedistribution"));