From 29bf0cd718d436331830f1eaafda78451dc87aca Mon Sep 17 00:00:00 2001
From: abhishek <abhishek@cloud.com>
Date: Thu, 23 Sep 2010 10:05:56 -0700
Subject: [PATCH] bug 6238: fixing some api issues with the deploy vm cmd
 status 6238: resolved fixed

---
 server/src/com/cloud/async/executor/UpgradeVMExecutor.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/src/com/cloud/async/executor/UpgradeVMExecutor.java b/server/src/com/cloud/async/executor/UpgradeVMExecutor.java
index 687d11f3ebb..884f03cd989 100644
--- a/server/src/com/cloud/async/executor/UpgradeVMExecutor.java
+++ b/server/src/com/cloud/async/executor/UpgradeVMExecutor.java
@@ -92,10 +92,10 @@ public class UpgradeVMExecutor extends BaseAsyncJobExecutor {
 		ServiceOfferingVO offering = ms.findServiceOfferingById(vm.getServiceOfferingId());
 		resultObj.setCpuSpeed(offering.getSpeed());
 		resultObj.setMemory(offering.getRamSize());
-		if(offering.getDisplayText()!=null)
-			resultObj.setServiceOfferingName(offering.getDisplayText());
-		else
+		if(offering.getName()!=null)
 			resultObj.setServiceOfferingName(offering.getName());
+		else
+			resultObj.setServiceOfferingName(offering.getDisplayText());
 		resultObj.setServiceOfferingId(vm.getServiceOfferingId());
 		
 		VmStats vmStats = ms.getVmStatistics(vm.getId());