diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index fa8789b6547..ff013881fe8 100755 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -144,7 +144,7 @@ public class VirtualRoutingResource implements Manager { command.add("-p ", rule.getStringSrcPortRange()); command.add("-r ", rule.getDstIp()); command.add("-d ", rule.getStringDstPortRange()); - if (rule.getSourceCidrs().size() > 0){ + if (rule.getSourceCidrs() != null && rule.getSourceCidrs().size() > 0){ command.add(" -s " + rule.getStringSourceCidrs()); } result = command.execute(); diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index ece14da0b17..e5f57b70653 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -1220,7 +1220,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe args.append(" -p ").append(rule.getStringSrcPortRange()); args.append(" -r ").append(rule.getDstIp()); args.append(" -d ").append(rule.getStringDstPortRange()); - if (rule.getSourceCidrs().size() > 0){ + if (rule.getSourceCidrs() != null && rule.getSourceCidrs().size() > 0){ args.append(" -s " + rule.getStringSourceCidrs()); } String result = callHostPlugin(conn, "vmops", "setFirewallRule", "args", args.toString());