summaryrefslogtreecommitdiffstats
path: root/controller-api
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2019-09-10 09:12:50 +0200
committerGitHub <noreply@github.com>2019-09-10 09:12:50 +0200
commit91d7d4dc1d940490d80ea5cd6b3d676a6f9a50fb (patch)
tree4c099fd9c718bf247ef8a6c4b139fdc712ea24a0 /controller-api
parentee16b1e2c5482caa74be978806b87017c6793af7 (diff)
parentb95872d119a7c4b985df7f5e4b4442d4cbf47a3f (diff)
Merge pull request #10576 from vespa-engine/mpolden/handle-null
Handle null node membership
Diffstat (limited to 'controller-api')
-rw-r--r--controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
index cf3b69ab9ce..e9b0c69e904 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/configserver/NodeRepository.java
@@ -101,6 +101,7 @@ public interface NodeRepository {
}
private static Node.ClusterType clusterTypeOf(NodeMembership nodeMembership) {
+ if (nodeMembership == null) return Node.ClusterType.unknown;
switch (nodeMembership.clustertype) {
case "admin": return Node.ClusterType.admin;
case "content": return Node.ClusterType.content;