Repository: usergrid Updated Branches: refs/heads/release-2.1.1 6b195a07b -> 3a9623927
Make sure migration classes are rolled to the latest supported before initializing mgmt app on database/bootstrap. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/3a962392 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/3a962392 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/3a962392 Branch: refs/heads/release-2.1.1 Commit: 3a9623927b093a4fb1cf6155faeb19c96a6502b6 Parents: 6b195a0 Author: Michael Russo <[email protected]> Authored: Sun May 8 22:17:51 2016 +0800 Committer: Michael Russo <[email protected]> Committed: Sun May 8 22:17:51 2016 +0800 ---------------------------------------------------------------------- .../usergrid/corepersistence/CpEntityManagerFactory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/3a962392/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java index c3bcaf6..91a936d 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java @@ -530,12 +530,12 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application // Always make sure the database schema is initialized getSetup().initSchema(); - // Make sure the management application is created - initMgmtAppInternal(); - // Roll the new 2.x Migration classes to the latest version supported getSetup().runDataMigration(); + // Make sure the management application is created + initMgmtAppInternal(); + // Ensure management app is initialized getSetup().initMgmtApp();
