diff options
author | jonmv <venstad@gmail.com> | 2022-11-01 22:11:07 +0100 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2022-11-01 22:11:07 +0100 |
commit | 116afffc4920705f8d0ce2b016700216a2a0cbb3 (patch) | |
tree | 59219dc968c7c6addbed5375e062d835a34a6f0d /config/src/main/java/com/yahoo/config/subscription/impl/FileConfigSubscription.java | |
parent | 4984373de8e6b5b4b6d62d13e7efbaf0f025b2c5 (diff) |
No real changes
Diffstat (limited to 'config/src/main/java/com/yahoo/config/subscription/impl/FileConfigSubscription.java')
-rw-r--r-- | config/src/main/java/com/yahoo/config/subscription/impl/FileConfigSubscription.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/src/main/java/com/yahoo/config/subscription/impl/FileConfigSubscription.java b/config/src/main/java/com/yahoo/config/subscription/impl/FileConfigSubscription.java index 5311b91c31f..47ac0dfbf85 100644 --- a/config/src/main/java/com/yahoo/config/subscription/impl/FileConfigSubscription.java +++ b/config/src/main/java/com/yahoo/config/subscription/impl/FileConfigSubscription.java @@ -11,6 +11,7 @@ import com.yahoo.vespa.config.ConfigPayload; import java.io.File; import java.io.IOException; +import java.nio.file.Files; import java.util.Arrays; import static java.util.logging.Level.FINE; @@ -29,13 +30,12 @@ public class FileConfigSubscription<T extends ConfigInstance> extends ConfigSubs super(key); setGeneration(0L); file = f; - if (!file.exists() && !file.isFile()) - throw new IllegalArgumentException("Not a file: " + file); + if ( ! file.isFile()) throw new IllegalArgumentException("Not a file: " + file); } @Override public boolean nextConfig(long timeout) { - if (!file.exists() && !file.isFile()) throw new IllegalArgumentException("Not a file: " + file); + if ( ! file.isFile()) throw new IllegalArgumentException("Not a file: " + file); if (checkReloaded()) { log.log(FINE, () -> "User forced config reload at " + System.currentTimeMillis()); // User forced reload @@ -61,7 +61,7 @@ public class FileConfigSubscription<T extends ConfigInstance> extends ConfigSubs private T updateConfig() { ts = file.lastModified(); try { - ConfigPayload payload = new CfgConfigPayloadBuilder().deserialize(Arrays.asList(IOUtils.readFile(file).split("\n"))); + ConfigPayload payload = new CfgConfigPayloadBuilder().deserialize(Files.readAllLines(file.toPath())); return payload.toInstance(configClass, key.getConfigId()); } catch (IOException e) { throw new ConfigurationRuntimeException(e); |