From d769a73cfc1b5728b2fe917e322b2109c3f5284e Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Mon, 7 Oct 2013 11:57:37 -0700 Subject: [PATCH] Fix DatabaseUpgradeChecker in standalone context When running DatabaseUpgradeChecker as a standalone program _dao will not be injected. Still create an instance of VersionDaoImpl in constructor and when DatabaseUpgradeChecker is ran in the mgmt server it will be overwritten by the injected value. --- .../schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java index 1afd0560f80..6020bbbb86b 100755 --- a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java +++ b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java @@ -67,6 +67,7 @@ import com.cloud.upgrade.dao.Upgrade420to430; import com.cloud.upgrade.dao.UpgradeSnapshot217to224; import com.cloud.upgrade.dao.UpgradeSnapshot223to224; import com.cloud.upgrade.dao.VersionDao; +import com.cloud.upgrade.dao.VersionDaoImpl; import com.cloud.upgrade.dao.VersionVO; import com.cloud.upgrade.dao.VersionVO.Step; import com.cloud.utils.component.SystemIntegrityChecker; @@ -85,6 +86,8 @@ public class DatabaseUpgradeChecker implements SystemIntegrityChecker { VersionDao _dao; public DatabaseUpgradeChecker() { + _dao = new VersionDaoImpl(); + _upgradeMap.put("2.1.7", new DbUpgrade[] {new Upgrade217to218(), new Upgrade218to22(), new Upgrade221to222(), new UpgradeSnapshot217to224(), new Upgrade222to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(),