commit e3a2762235769287f18d5565f6dbae46a91bbca0
author nvazquez <nicovazquez90@gmail.com> Wed Nov 01 00:34:42 2023 -0300
committer nvazquez <nicovazquez90@gmail.com> Wed Nov 01 00:34:42 2023 -0300
tree ac4a641db0cf6b6bcb297de6c39af2c33f2eefdc
parent dc90d0b9dd17f5738182c80da2a70e2aadaa5f39

Fix public NIC NPE on broadcast URI

server/src/main/java/com/cloud/network/router/CommandSetupHelper.java

diff --git a/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java b/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java
index 3fca22a..743e03d 100644
--- a/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java
+++ b/server/src/main/java/com/cloud/network/router/CommandSetupHelper.java
@@ -1359,7 +1359,8 @@
         nicTO.setMac(ipAddress.getVifMacAddress());
         nicTO.setType(ipAddress.getTrafficType());
         nicTO.setGateway(ipAddress.getVlanGateway());
-        nicTO.setBroadcastUri(BroadcastDomainType.fromString(ipAddress.getBroadcastUri()));
+        URI broadcastUri = ipAddress.getBroadcastUri() != null ? BroadcastDomainType.fromString(ipAddress.getBroadcastUri()) : null;
+        nicTO.setBroadcastUri(broadcastUri);
         nicTO.setType(network.getTrafficType());
         nicTO.setName(_networkModel.getNetworkTag(router.getHypervisorType(), network));
         nicTO.setBroadcastType(network.getBroadcastDomainType());