Prevent NullPointer on a network with removed IP ranges/"VLANs"

java.lang.NullPointerException
        at com.cloud.network.NetworkModelImpl.getPlaceholderNicForRouter(NetworkModelImpl.java:2306)

Author: GabrielBrascher

engine/schema/src/main/java/com/cloud/dc/dao/VlanDaoImpl.java

@@ -167,7 +167,10 @@ public List<VlanVO> listVlansForPod(long podId) {
         List<PodVlanMapVO> vlanMaps = _podVlanMapDao.listPodVlanMapsByPod(podId);
         List<VlanVO> result = new ArrayList<VlanVO>();
         for (PodVlanMapVO pvmvo : vlanMaps) {
-            result.add(findById(pvmvo.getVlanDbId()));
+            VlanVO vlanByPodId = findById(pvmvo.getVlanDbId());
+            if (vlanByPodId != null && vlanByPodId.getRemoved() == null) {
+                result.add(vlanByPodId);
+            }
         }
         return result;
     }