From d5d852bb055f0b1073e1b7e27b593dd7c957acf6 Mon Sep 17 00:00:00 2001 From: Remi Bergsma Date: Sun, 13 Sep 2020 13:17:29 +0200 Subject: [PATCH] Prevent NPE when gateway is not present --- .../src/main/java/com/cloud/network/guru/GuestNetworkGuru.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cosmic-core/server/src/main/java/com/cloud/network/guru/GuestNetworkGuru.java b/cosmic-core/server/src/main/java/com/cloud/network/guru/GuestNetworkGuru.java index 15034837d8..729badf711 100644 --- a/cosmic-core/server/src/main/java/com/cloud/network/guru/GuestNetworkGuru.java +++ b/cosmic-core/server/src/main/java/com/cloud/network/guru/GuestNetworkGuru.java @@ -373,7 +373,7 @@ private String assignGuestOrGatewayIp(final Network network, final NicProfile ni s_logger.debug("Check if the gateway ip is requested"); // Check if we can assign the gateway - if (nic.getIPv4Gateway().equals(nic.getRequestedIPv4())) { + if (nic.getIPv4Gateway() != null && nic.getIPv4Gateway().equals(nic.getRequestedIPv4())) { s_logger.debug("VM requests gateway ip address for network " + network.getName() + " with offering " + networkOffering.getName() + " . Check service offering"); final boolean networkOfferingSupportsGatewayService = _networkOfferingServiceMapDao.areServicesSupportedByNetworkOffering(networkOfferingId, Service.Gateway);