Unbox timestamp with default, to prevent NPE.

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));
     }
 }