From bfe5aa7aa74b2048a58cc3723ead2244e80730ac Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 11 Feb 2025 10:48:52 +0530 Subject: [PATCH] server: fix npe during start vr edge case DeploymentPlanner.addPod takes long value while VmInstanceVO.getPodIdToDeployIn returns a Long value which can be null when the VM is never started. Signed-off-by: Abhishek Kumar --- .../main/java/com/cloud/network/router/NetworkHelperImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java index 38286b5d4d94..4a1c5b64d210 100644 --- a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java +++ b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java @@ -445,7 +445,9 @@ public DomainRouterVO startVirtualRouter(final DomainRouterVO router, final User final int retryIndex = 5; final ExcludeList[] avoids = new ExcludeList[5]; avoids[0] = new ExcludeList(); - avoids[0].addPod(routerToBeAvoid.getPodIdToDeployIn()); + if (routerToBeAvoid.getPodIdToDeployIn() != null) { + avoids[0].addPod(routerToBeAvoid.getPodIdToDeployIn()); + } avoids[1] = new ExcludeList(); avoids[1].addCluster(_hostDao.findById(routerToBeAvoid.getHostId()).getClusterId()); avoids[2] = new ExcludeList();