summaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-09-07 12:42:00 +0200
committerJon Bratseth <bratseth@oath.com>2018-09-07 12:42:00 +0200
commitad6540e0e71b8db2d236f029266cfacc0a0f11a8 (patch)
tree134e629a8354ec1af6d34ba109b20d7a551d5c49 /container-core
parentea8f65fe18d31204f7c3ba9814e1806b38a1f463 (diff)
Read fiel distribution file reference correctly
Diffstat (limited to 'container-core')
-rw-r--r--container-core/src/main/java/com/yahoo/container/core/BundleLoaderProperties.java5
-rw-r--r--container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java2
2 files changed, 4 insertions, 3 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/BundleLoaderProperties.java b/container-core/src/main/java/com/yahoo/container/core/BundleLoaderProperties.java
index c94dc30fd6f..ee12c7d4c9f 100644
--- a/container-core/src/main/java/com/yahoo/container/core/BundleLoaderProperties.java
+++ b/container-core/src/main/java/com/yahoo/container/core/BundleLoaderProperties.java
@@ -3,12 +3,13 @@ package com.yahoo.container.core;
/**
* @author gjoranv
- * @since 5.46
*/
public interface BundleLoaderProperties {
+
// TODO: This should be removed. The prefix is used to separate the bundles in BundlesConfig
// into those that are transferred with filedistribution and those that are preinstalled
// on disk. Instead, the model should have put them in two different configs. I.e. create a new
// config 'preinstalled-bundles.def'.
- public static final String DISK_BUNDLE_PREFIX = "file:";
+ String DISK_BUNDLE_PREFIX = "file:";
+
}
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java b/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java
index eceb41f9739..c0a68086212 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/BundleLoader.java
@@ -95,7 +95,7 @@ public class BundleLoader {
log.info("Installing bundle from disk with reference '" + reference.value() + "'");
File file = new File(referenceFileName);
- if (!file.exists()) {
+ if ( ! file.exists()) {
throw new IllegalArgumentException("Reference '" + reference.value() + "' not found on disk.");
}