summaryrefslogtreecommitdiffstats
path: root/node-repository
diff options
context:
space:
mode:
authorvalerijf <valerijf@yahoo-inc.com>2017-05-30 13:41:34 +0200
committervalerijf <valerijf@yahoo-inc.com>2017-05-30 13:41:34 +0200
commit3c7f06b8383c3ba8019c1e14fa2ea8f4f63d337a (patch)
tree39a2b7a410ed88513e36f3da41d6bfdb411e4dbf /node-repository
parentebefe966da7f8e97f9fd217ae8ad836368656491 (diff)
Make sure wantToUnprovision has a default in node deserialization
Diffstat (limited to 'node-repository')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
index 55d5a7defec..173ce77244e 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/NodeSerializer.java
@@ -166,6 +166,8 @@ public class NodeSerializer {
}
private Status statusFromSlime(Inspector object) {
+ // TODO: Simplify after June 2017
+ boolean wantToUnprovision = object.field(wantToUnprovisionKey).valid() && object.field(wantToUnprovisionKey).asBool();
return new Status(generationFromSlime(object, rebootGenerationKey, currentRebootGenerationKey),
versionFromSlime(object.field(vespaVersionKey)),
versionFromSlime(object.field(hostedVersionKey)),
@@ -173,7 +175,7 @@ public class NodeSerializer {
(int)object.field(failCountKey).asLong(),
hardwareFailureFromSlime(object.field(hardwareFailureKey)),
object.field(wantToRetireKey).asBool(),
- object.field(wantToUnprovisionKey).asBool());
+ wantToUnprovision);
}
private Flavor flavorFromSlime(Inspector object) {