From a959726f38fe7b035c54ad9896b7e6326a322ad7 Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Mon, 28 Mar 2011 18:15:13 -0700
Subject: [PATCH] bug 9200: Fixed issue when attempting to change the service
 offering of a VM who's current service offering has been deleted.

---
 server/src/com/cloud/server/ManagementServerImpl.java | 2 +-
 server/src/com/cloud/vm/UserVmManagerImpl.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index d1da362b797..89bc7318f4a 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1080,7 +1080,7 @@ public class ManagementServerImpl implements ManagementServer {
                 }
             }
 
-            ServiceOfferingVO offering = _offeringsDao.findById(vmInstance.getServiceOfferingId());
+            ServiceOfferingVO offering = _offeringsDao.findByIdIncludingRemoved(vmInstance.getServiceOfferingId());
             sc.addAnd("id", SearchCriteria.Op.NEQ, offering.getId());
             
             // Only return offerings with the same Guest IP type and storage pool preference
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 55421da5bb2..2198d4dad09 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -857,7 +857,7 @@ public class UserVmManagerImpl implements UserVmManager, UserVmService, Manager
             throw new InvalidParameterValueException("Not upgrading vm " + vmInstance.toString() + " since it already has the requested service offering (" + newServiceOffering.getName() + ")");
         }
         
-        ServiceOfferingVO currentServiceOffering = _offeringDao.findById(vmInstance.getServiceOfferingId());
+        ServiceOfferingVO currentServiceOffering = _offeringDao.findByIdIncludingRemoved(vmInstance.getServiceOfferingId());
         
         // Check that the service offering being upgraded to has the same Guest IP type as the VM's current service offering
         // NOTE: With the new network refactoring in 2.2, we shouldn't need the check for same guest IP type anymore.