cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelv...@apache.org
Subject [3/3] git commit: refs/heads/4.1 - 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
Date Sat, 09 Mar 2013 02:05:08 GMT
Updated Branches:
  refs/heads/4.1 889e76bf6 -> 0f000ad4f


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


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0f000ad4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0f000ad4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0f000ad4

Branch: refs/heads/4.1
Commit: 0f000ad4ffba49dcee994c020d63c19dcbcb430e
Parents: 00f63c4
Author: Kelven Yang <kelveny@gmail.com>
Authored: Fri Mar 8 17:40:02 2013 -0800
Committer: Kelven Yang <kelveny@gmail.com>
Committed: Fri Mar 8 17:40:02 2013 -0800

----------------------------------------------------------------------
 .../hypervisor/vmware/resource/VmwareResource.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/0f000ad4/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
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 841a535..085d545 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;


Mime
View raw message