Handle null ACL fields

1 files changed, 10 insertions, 3 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/Acl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/Acl.java
index 050f1e39cc3..f377a603ab6 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/Acl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/Acl.java
@@ -32,9 +32,9 @@ public class Acl {
      * @param trustedNetworks Networks (in CIDR notation) to trust
      */
     public Acl(Set<Integer> trustedPorts, Set<Node> trustedNodes, Set<String> trustedNetworks) {
-        this.trustedNodes = Set.copyOf(Objects.requireNonNull(trustedNodes, "trustedNodes must be non-null"));
-        this.trustedPorts = Set.copyOf(Objects.requireNonNull(trustedPorts, "trustedPorts must be non-null"));
-        this.trustedNetworks = Set.copyOf(Objects.requireNonNull(trustedNetworks, "trustedNetworks must be non-null"));
+        this.trustedNodes = copyOfNullable(trustedNodes);
+        this.trustedPorts = copyOfNullable(trustedPorts);
+        this.trustedNetworks = copyOfNullable(trustedNetworks);
     }
 
     public Acl(Set<Integer> trustedPorts, Set<Node> trustedNodes) {
@@ -130,6 +130,13 @@ public class Acl {
                         .collect(Collectors.toUnmodifiableSet());
     }
 
+    private static <T> Set<T> copyOfNullable(Set<T> set) {
+        if (set == null) {
+            return Collections.emptySet();
+        }
+        return Set.copyOf(set);
+    }
+
     public static class Node {
         private final String hostname;
         private final InetAddress inetAddress;