From 9db2925b777a44168eb0811714fbd512105e0eed Mon Sep 17 00:00:00 2001
From: Kelven Yang <kelven@cloud.com>
Date: Fri, 27 Aug 2010 20:01:06 -0700
Subject: [PATCH] Make database config recognize service offering change

---
 .../src/com/cloud/storage/download/DownloadMonitorImpl.java   | 4 +++-
 server/src/com/cloud/test/DatabaseConfig.java                 | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
index a559a67c101..db971ec0fe8 100755
--- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
+++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java
@@ -417,7 +417,9 @@ public class DownloadMonitorImpl implements  DownloadMonitor {
 		if (storageHost == null) {
 			s_logger.warn("Huh? Agent id " + sserverId + " does not correspond to a row in hosts table?");
 			return;
-		}		Set<VMTemplateVO> toBeDownloaded = new HashSet<VMTemplateVO>();
+		}		
+		
+		Set<VMTemplateVO> toBeDownloaded = new HashSet<VMTemplateVO>();
 		List<VMTemplateVO> allTemplates = _templateDao.listAllInZone(storageHost.getDataCenterId());
 		VMTemplateVO rtngTmplt = _templateDao.findRoutingTemplate();
 		VMTemplateVO defaultBuiltin = _templateDao.findDefaultBuiltinTemplate();
diff --git a/server/src/com/cloud/test/DatabaseConfig.java b/server/src/com/cloud/test/DatabaseConfig.java
index 8fb5fc5104c..98cafed8368 100644
--- a/server/src/com/cloud/test/DatabaseConfig.java
+++ b/server/src/com/cloud/test/DatabaseConfig.java
@@ -124,6 +124,7 @@ public class DatabaseConfig {
     	fieldNames.add("ramSize");
     	fieldNames.add("speed");
     	fieldNames.add("useLocalStorage");
+    	fieldNames.add("hypervisorType");
     	fieldNames.add("diskSpace");
     	fieldNames.add("nwRate");
     	fieldNames.add("mcRate");