From 6c35a97cd8997fe63fe82fbe2923743034f2f089 Mon Sep 17 00:00:00 2001 From: Abhinandan Prateek Date: Tue, 14 Jun 2011 10:31:03 +0530 Subject: [PATCH] added check for null --- .../agent/resource/virtualnetwork/VirtualRoutingResource.java | 2 +- .../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java index ef7fedb8607..cdfb93ef231 100755 --- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java +++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java @@ -139,7 +139,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 fe4bf9b8c1a..214596a6c66 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -1224,7 +1224,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());