summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2021-09-10 15:55:50 +0200
committerValerij Fredriksen <valerijf@verizonmedia.com>2021-09-10 15:55:50 +0200
commit55eb24586dcb5ccb4971da4e9a70d962b7106ef5 (patch)
tree8ade5e2c1d38d8a3b5f92c5895fc740ff1f37760 /controller-server
parent216ad9f0773f0d1a0738167337bb5f42d46d46da (diff)
Fix directlyDeployed default value deserialization bug
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java2
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializer.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
index 976b92a1221..a5db6a152dd 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializer.java
@@ -426,7 +426,7 @@ public class ApplicationSerializer {
// TODO (freva): Simplify once this has rolled out everywhere
Inspector deployedDirectlyInspector = object.field(deployedDirectlyField);
- boolean deployedDirectly = !deployedDirectlyInspector.valid() || deployedDirectlyInspector.asBool();
+ boolean deployedDirectly = deployedDirectlyInspector.valid() && deployedDirectlyInspector.asBool();
return new ApplicationVersion(sourceRevision, applicationBuildNumber, authorEmail, compileVersion, buildTime, sourceUrl, commit, deployedDirectly);
}
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializer.java
index ae9e45af346..b4a580a1562 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializer.java
@@ -178,7 +178,7 @@ class RunSerializer {
// TODO (freva): Simplify once this has rolled out everywhere
Inspector deployedDirectlyInspector = versionObject.field(deployedDirectlyField);
- boolean deployedDirectly = !deployedDirectlyInspector.valid() || deployedDirectlyInspector.asBool();
+ boolean deployedDirectly = deployedDirectlyInspector.valid() && deployedDirectlyInspector.asBool();
return new ApplicationVersion(source, OptionalLong.of(buildNumber), authorEmail,
compileVersion, buildTime, sourceUrl, commit, deployedDirectly);