Merge pull request #907 from MissionCriticalCloud/fix/npe-no-gateway

Prevent NPE when gateway is not present
MissionCriticalCloud · Sep 21, 2020 · 52bbf44 · 52bbf44
2 parents b75a895 + d5d852b
commit 52bbf44
Showing 1 changed file with 1 addition and 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
@@ -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);