From 7c32b2da62aac42102e400849fbacecc58a4a12d Mon Sep 17 00:00:00 2001
From: abhishek <abhishek@cloud.com>
Date: Fri, 18 Feb 2011 14:09:00 -0800
Subject: [PATCH] bug 8584: enabling search by id for regular users and domain
 admins for service offerings status 8584: resolved fixed

---
 .../com/cloud/server/ManagementServerImpl.java    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index b907dc883fe..ed38e069c59 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -1104,6 +1104,13 @@ public class ManagementServerImpl implements ManagementServer {
 		if(domainRecord != null)
 		{
 			while(true){
+			    if(id != null) {
+			        ServiceOfferingVO so = _offeringsDao.findById((Long)id);
+			        if(so != null)
+			            sol.add(so);
+			        return sol;
+			    }
+			    
 				SearchCriteria<ServiceOfferingVO> sc = _offeringsDao.createSearchCriteria();
 				
 		        if (keyword != null) {
@@ -1130,10 +1137,10 @@ public class ManagementServerImpl implements ManagementServer {
 		            sc.addAnd("useLocalStorage", SearchCriteria.Op.EQ, offering.getUseLocalStorage());
 		        }
 
-		        if (id != null) {
-		        	includePublicOfferings = false;
-		            sc.addAnd("id", SearchCriteria.Op.EQ, id);
-		        }
+//		        if (id != null) {
+//		        	includePublicOfferings = false;
+//		            sc.addAnd("id", SearchCriteria.Op.EQ, id);
+//		        }
 
 		        if (name != null) {
 		        	includePublicOfferings = false;