diff --git a/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java b/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java index 0e3d2e8aae4..5cb37daff63 100644 --- a/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java +++ b/server/src/com/cloud/upgrade/dao/VersionDaoImpl.java @@ -152,7 +152,7 @@ public class VersionDaoImpl extends GenericDaoBase implements V throw new ConfigurationException("There is no upgrade path from " + dbVersion + " to " + currentVersion); } - if (Version.compare(currentVersion, upgrades[upgrades.length - 1].getUpgradedVersion()) == 0) { + if (Version.compare(currentVersion, upgrades[upgrades.length - 1].getUpgradedVersion()) != 0) { throw new ConfigurationException("The end upgrade version is actually at " + upgrades[upgrades.length - 1].getUpgradedVersion() + " but our management server code version is at " + currentVersion); } diff --git a/server/test/com/cloud/upgrade/dao/AdvanceZone217To221UpgradeTest.java b/server/test/com/cloud/upgrade/dao/AdvanceZone217To221UpgradeTest.java index 7763b3ec7fb..c11f929ba40 100644 --- a/server/test/com/cloud/upgrade/dao/AdvanceZone217To221UpgradeTest.java +++ b/server/test/com/cloud/upgrade/dao/AdvanceZone217To221UpgradeTest.java @@ -79,7 +79,7 @@ public class AdvanceZone217To221UpgradeTest extends TestCase { assert version.equals("2.1.7") : "Version returned is not 2.1.7 but " + version; try { - dao.upgrade("2.1.7", "2.2.1"); + dao.upgrade("2.1.7", "2.2.3"); } catch (ConfigurationException e) { s_logger.warn("Exception: ", e); assert false : "The test failed. Check logs"; diff --git a/server/test/com/cloud/upgrade/dao/BasicZone217To221UpgradeTest.java b/server/test/com/cloud/upgrade/dao/BasicZone217To221UpgradeTest.java index 9d94fca26c4..1662969f974 100644 --- a/server/test/com/cloud/upgrade/dao/BasicZone217To221UpgradeTest.java +++ b/server/test/com/cloud/upgrade/dao/BasicZone217To221UpgradeTest.java @@ -71,7 +71,7 @@ public class BasicZone217To221UpgradeTest extends TestCase { } try { - dao.upgrade("2.1.7", "2.2.1"); + dao.upgrade("2.1.7", "2.2.3"); } catch (ConfigurationException e) { s_logger.warn("Exception: ", e); assert false : "The test failed. Check logs";