Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9C2A010EFD for ; Wed, 23 Oct 2013 19:46:31 +0000 (UTC) Received: (qmail 59778 invoked by uid 500); 23 Oct 2013 19:44:26 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 58914 invoked by uid 500); 23 Oct 2013 19:43:41 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 58187 invoked by uid 99); 23 Oct 2013 19:43:20 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Oct 2013 19:43:20 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 55A75319CAE; Wed, 23 Oct 2013 19:43:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: darren@apache.org To: commits@cloudstack.apache.org Date: Wed, 23 Oct 2013 19:43:32 -0000 Message-Id: <457d4cf2bf654995afc028d81a2a6a0a@git.apache.org> In-Reply-To: <6ad91b475f1e408ba6899bce3b21a33d@git.apache.org> References: <6ad91b475f1e408ba6899bce3b21a33d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/47] git commit: updated refs/heads/master to c910196 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. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d769a73c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d769a73c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d769a73c Branch: refs/heads/master Commit: d769a73cfc1b5728b2fe917e322b2109c3f5284e Parents: 614922f Author: Darren Shepherd Authored: Mon Oct 7 11:57:37 2013 -0700 Committer: Darren Shepherd Committed: Mon Oct 7 11:57:55 2013 -0700 ---------------------------------------------------------------------- engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d769a73c/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java b/engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java index 1afd056..6020bbb 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(),