From 281148d5516d3c69a4cd58d2b8b6f9cb35bda4fb Mon Sep 17 00:00:00 2001 From: Nicolas Vazquez Date: Tue, 23 Jul 2019 11:08:52 -0300 Subject: [PATCH] server: Fix stop VM issue on basic zones (#3501) CloudStack reports an error while stopping/expunging VMs on basic zones Fixes #3497 --- .../cloudstack/network/topology/BasicNetworkVisitor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java b/server/src/main/java/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java index 8efb16320cf..d7a94faac0c 100644 --- a/server/src/main/java/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java +++ b/server/src/main/java/org/apache/cloudstack/network/topology/BasicNetworkVisitor.java @@ -198,7 +198,9 @@ public class BasicNetworkVisitor extends NetworkTopologyVisitor { final DeployDestination destination = dhcp.getDestination(); final boolean remove = dhcp.isRemove(); - if (router.getPodIdToDeployIn().longValue() == destination.getPod().getId()) { + if (router != null && (remove || (destination != null && destination.getPod() != null && + router.getPodIdToDeployIn() != null && + router.getPodIdToDeployIn().longValue() == destination.getPod().getId()))) { _commandSetupHelper.createDhcpEntryCommand(router, userVM, nicVo, remove, commands); return _networkGeneralHelper.sendCommandsToRouter(router, commands);