From bc4357f7ddca17598e827d5af321667c5ad84be2 Mon Sep 17 00:00:00 2001
From: abhishek <abhishek@cloud.com>
Date: Mon, 7 Feb 2011 18:34:08 -0800
Subject: [PATCH] bug 8456: fixing the upgrade issue status 8456: resolved
 fixed

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

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index a565b5bd71c..7c734287caf 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1098,6 +1098,7 @@ public class ManagementServerImpl implements ManagementServer {
         sc.addAnd("systemUse", SearchCriteria.Op.EQ, false);
 
         return _offeringsDao.search(sc, searchFilter);
+        
     }
 
     private List<ServiceOfferingVO> searchServiceOfferingsInternal(Account account, Object name, Object id, Long vmId, Object keyword, Filter searchFilter){
@@ -1121,7 +1122,6 @@ public class ManagementServerImpl implements ManagementServer {
 
 		            sc.addAnd("name", SearchCriteria.Op.SC, ssc);
 		        } else if (vmId != null) {
-		        	includePublicOfferings = false;
 		            UserVmVO vmInstance = _userVmDao.findById(vmId);
 		            if ((vmInstance == null) || (vmInstance.getRemoved() != null)) {
 		                throw new InvalidParameterValueException("unable to find a virtual machine with id " + vmId);
@@ -1174,8 +1174,8 @@ public class ManagementServerImpl implements ManagementServer {
 		if(includePublicOfferings) {
             sol.addAll(_offeringsDao.findPublicServiceOfferings());
         }
-		
-    	return sol;
+
+		return sol;
     }
     @Override
     public List<ClusterVO> searchForClusters(ListClustersCmd cmd) {