keycloak-uncached

swap import and migrate order

9/30/2015 8:31:22 AM

Michael Gerber

Commit: acefd3c

Tree: fdab50d

Parents: 15a5c87

Changes

services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java 4(+2 -2)

Details

services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java 4(+2 -2)

diff --git a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
index ab55ef3..28818d8 100755
--- a/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
+++ b/services/src/main/java/org/keycloak/services/resources/KeycloakApplication.java
@@ -83,12 +83,12 @@ public class KeycloakApplication extends Application {
         classes.add(JsResource.class);
         classes.add(WelcomeResource.class);
 
-        new ExportImportManager().checkExportImport(this.sessionFactory, context.getContextPath());
 
         setupDefaultRealm(context.getContextPath());
 
-        importRealms(context);
         migrateModel();
+        new ExportImportManager().checkExportImport(this.sessionFactory, context.getContextPath());
+        importRealms(context);
 
         AdminRecovery.recover(sessionFactory);