diff options
author | Harald Musum <musum@yahooinc.com> | 2023-03-09 08:35:48 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2023-03-09 08:35:48 +0100 |
commit | b8f1ff223949b478659d646cd2c6636058ba2d74 (patch) | |
tree | df8b864335f23d4521db67fc8fa5310a03a0bd12 /configserver | |
parent | 2c16cb82fa141bbebd5890f3abfe0ffb2eae29b8 (diff) |
Use equals when comparing versions
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java | 2 | ||||
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/version/VersionState.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java index 885aedb0cbe..65e2b35f954 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java @@ -128,7 +128,7 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable public void start() { startRpcServerWithFileDistribution(); // No config requests allowed yet, will be allowed after bootstrapping done if (versionState.isUpgraded()) { - if (versionState.storedVersion() != Version.emptyVersion) + if ( ! versionState.storedVersion().equals(Version.emptyVersion)) log.log(Level.INFO, "Config server upgrading from " + versionState.storedVersion() + " to " + versionState.currentVersion() + ". Redeploying all applications"); try { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/version/VersionState.java b/configserver/src/main/java/com/yahoo/vespa/config/server/version/VersionState.java index 053bc491426..589d121481a 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/version/VersionState.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/version/VersionState.java @@ -69,7 +69,7 @@ public class VersionState { try (FileReader reader = new FileReader(versionFile)) { return Version.fromString(IOUtils.readAll(reader)); } catch (Exception e) { - return new Version(0, 0, 0); // Use an old value to signal we don't know + return Version.emptyVersion; } } |