Use try-with-resources, rename some variables, improve some messages

2 files changed, 5 insertions, 6 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
index 685856d5cf8..11cec9efd95 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/zookeeper/ZKApplicationPackage.java
@@ -93,8 +93,7 @@ public class ZKApplicationPackage implements ApplicationPackage {
         try {
             return PreGeneratedFileRegistry.importRegistry(zkApplication.getDataReader(fileRegistryNode));
         } catch (Exception e) {
-            throw new RuntimeException("Could not determine which files to distribute. " +
-                                       "Please try redeploying the application", e);
+            throw new RuntimeException("Could not determine which files to distribute", e);
         }
     }
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java b/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java
index f03550c0a80..68dd5396cf1 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/TestComponentRegistry.java
@@ -51,7 +51,7 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
     private final TenantListener tenantListener;
     private final PermanentApplicationPackage permanentApplicationPackage;
     private final HostRegistries hostRegistries;
-    private final FileDistributionFactory fileDistributionProvider;
+    private final FileDistributionFactory fileDistributionFactory;
     private final ModelFactoryRegistry modelFactoryRegistry;
     private final Optional<Provisioner> hostProvisioner;
     private final Zone zone;
@@ -65,7 +65,7 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
     private TestComponentRegistry(Curator curator, ConfigCurator configCurator, Metrics metrics,
                                   ModelFactoryRegistry modelFactoryRegistry,
                                   PermanentApplicationPackage permanentApplicationPackage,
-                                  FileDistributionFactory fileDistributionProvider,
+                                  FileDistributionFactory fileDistributionFactory,
                                   HostRegistries hostRegistries,
                                   ConfigserverConfig configserverConfig,
                                   SessionPreparer sessionPreparer,
@@ -86,7 +86,7 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
         this.defRepo = defRepo;
         this.permanentApplicationPackage = permanentApplicationPackage;
         this.hostRegistries = hostRegistries;
-        this.fileDistributionProvider = fileDistributionProvider;
+        this.fileDistributionFactory = fileDistributionFactory;
         this.modelFactoryRegistry = modelFactoryRegistry;
         this.hostProvisioner = hostProvisioner;
         this.sessionPreparer = sessionPreparer;
@@ -247,6 +247,6 @@ public class TestComponentRegistry implements GlobalComponentRegistry {
         return secretStore;
     }
 
-    public FileDistributionFactory getFileDistributionProvider() { return fileDistributionProvider; }
+    public FileDistributionFactory getFileDistributionFactory() { return fileDistributionFactory; }
 
 }