From 8d6bb176f43d0ec8c4b89ea54dd485cdf3cf1b46 Mon Sep 17 00:00:00 2001
From: Vijayendra Bhamidipati <vijayendra.bhamidipati@citrix.com>
Date: Thu, 17 May 2012 19:14:54 -0700
Subject: [PATCH] CS-14937: System VMs and Router VMs does not come up after
 upgrading from 3.0 to Bonita

Description:

	Reverting my earlier fix for bug 14937. The fix is
	not needed.
---
 .../com/cloud/hypervisor/vmware/resource/VmwareResource.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index b8e8ebe4bf2..dc2a9fc3ec2 100755
--- a/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/core/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -1479,7 +1479,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
                 s_logger.info("Prepare NIC device based on NicTO: " + _gson.toJson(nicTo));
 
                 Pair<ManagedObjectReference, String> networkInfo = prepareNetworkFromNicInfo(vmMo.getRunningHost(), nicTo);
-                if (_nexusVSwitch) {
+                if (mgr.getNexusVSwitchGlobalParameter()) {
                     String dvSwitchUuid;
                     ManagedObjectReference dcMor = hyperHost.getHyperHostDatacenter();
                     DatacenterMO dataCenterMo = new DatacenterMO(context, dcMor);