From 3adee270c7bb699c4ccd5fd5486970979d8275fe Mon Sep 17 00:00:00 2001 From: "Rodrigo D. Lopez" Date: Thu, 13 Aug 2020 06:06:19 -0400 Subject: [PATCH] api: Prevent null pointer on listPublicIpAddress cmd (#4255) * Prevent null pointer on listPublicIpAddress cmd Insert an inner join between data_center table and user_ip_address where data_center.removed field is null * Remove extra join and add a filter for VLAN removed --- server/src/main/java/com/cloud/server/ManagementServerImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java index 926aca94f7e..49d39a8617f 100644 --- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java +++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java @@ -1983,6 +1983,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe final SearchBuilder vlanSearch = _vlanDao.createSearchBuilder(); vlanSearch.and("vlanType", vlanSearch.entity().getVlanType(), SearchCriteria.Op.EQ); + vlanSearch.and("removed", vlanSearch.entity().getRemoved(), SearchCriteria.Op.NULL); sb.join("vlanSearch", vlanSearch, sb.entity().getVlanId(), vlanSearch.entity().getId(), JoinBuilder.JoinType.INNER); if (isAllocated != null && isAllocated == true) {