You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/03/13 18:13:57 UTC
[2/35] git commit: refs/heads/ui-multiple-nics - 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
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/47db9242
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/47db9242
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/47db9242
Branch: refs/heads/ui-multiple-nics
Commit: 47db924275167f975b9a468a0b5d3aadf18e4e57
Parents: bab6839
Author: Kelven Yang <ke...@gmail.com>
Authored: Fri Mar 8 17:40:02 2013 -0800
Committer: Kelven Yang <ke...@gmail.com>
Committed: Mon Mar 11 14:07:39 2013 -0700
----------------------------------------------------------------------
.../hypervisor/vmware/resource/VmwareResource.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/47db9242/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 155d6d9..634827b 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
@@ -5034,7 +5034,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;