diff options
author | gjoranv <gjoranv@gmail.com> | 2023-09-14 16:28:58 +0200 |
---|---|---|
committer | gjoranv <gjoranv@gmail.com> | 2023-09-14 16:28:58 +0200 |
commit | f8ebaa617884140f9e78b224302c2b8daf3f396b (patch) | |
tree | e8e9d3ac81a6d19d399a3aeb9543cf80230851f2 /node-admin | |
parent | 2a3059c81454df60270fe037a29c799b4ed82c7f (diff) |
Unbox timestamp with default, to prevent NPE.
Diffstat (limited to 'node-admin')
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java index a48372c334f..a9cc2d698e9 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/RealNodeRepository.java @@ -147,10 +147,13 @@ public class RealNodeRepository implements NodeRepository { .toList(); if (ipAddresses.isEmpty()) return; + // Unbox to prevent NPE + long keyTimestamp = node.wireguardKeyTimestamp == null ? 0L : node.wireguardKeyTimestamp; + consumer.accept(new WireguardPeer(HostName.of(node.hostname), ipAddresses, WireguardKey.from(node.wireguardPubkey), - Instant.ofEpochMilli(node.wireguardKeyTimestamp))); + Instant.ofEpochMilli(keyTimestamp))); }) .sorted() .toList(); @@ -369,9 +372,12 @@ public class RealNodeRepository implements NodeRepository { } private static WireguardPeer createConfigserverPeer(GetWireguardResponse.Configserver configServer) { + // Unbox to prevent NPE + long keyTimestamp = configServer.wireguardKeyTimestamp == null ? 0L : configServer.wireguardKeyTimestamp; + return new WireguardPeer(HostName.of(configServer.hostname), configServer.ipAddresses.stream().map(VersionedIpAddress::from).toList(), WireguardKey.from(configServer.wireguardPubkey), - Instant.ofEpochMilli(configServer.wireguardKeyTimestamp)); + Instant.ofEpochMilli(keyTimestamp)); } } |