From 0f000ad4ffba49dcee994c020d63c19dcbcb430e Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelveny@gmail.com>
Date: Fri, 8 Mar 2013 17:40:02 -0800
Subject: [PATCH] CLOUDSTACK-1615: instead of returning empty host firewall
 ruleset, ESXi 5.0 Update 1 may return null to indicate empty host firewall
 ruleset, Cloudstack needs to handle this changed behave

---
 .../com/cloud/hypervisor/vmware/resource/VmwareResource.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 841a535bbce..085d5450e65 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -4911,7 +4911,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
                 boolean bRefresh = false;
                 if(firewallMo != null) {
                     HostFirewallInfo firewallInfo = firewallMo.getFirewallInfo();
-                    if(firewallInfo != null) {
+                    if(firewallInfo != null && firewallInfo.getRuleset() != null) {
                         for(HostFirewallRuleset rule : firewallInfo.getRuleset()) {
                             if("vncServer".equalsIgnoreCase(rule.getKey())) {
                                 bRefresh = true;