avoid mgmt app
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/c61d69f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/c61d69f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/c61d69f0
Branch: refs/heads/two-dot-o-dev
Commit: c61d69f0faf3c0e3dcb6f9b0a0908b7836802743
Parents: 24726af
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jul 1 16:02:47 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jul 1 16:02:47 2015 -0600
----------------------------------------------------------------------
.../apache/usergrid/management/AppInfoMigrationPlugin.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c61d69f0/stack/services/src/main/java/org/apache/usergrid/management/AppInfoMigrationPlugin.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/AppInfoMigrationPlugin.java b/stack/services/src/main/java/org/apache/usergrid/management/AppInfoMigrationPlugin.java
index 6cd487d..ff73402 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/AppInfoMigrationPlugin.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/AppInfoMigrationPlugin.java
@@ -194,9 +194,12 @@ public class AppInfoMigrationPlugin implements MigrationPlugin {
observer.update(getMaxVersion(), "Created application_info for " + appName);
// create org->app connections, but not for apps in dummy "usergrid" internal organization
- EntityRef orgRef = managementEm.getAlias(Group.ENTITY_TYPE, orgName);
- // create and connect new APPLICATION_INFO oldAppInfo to Organization
- managementService.createApplication(orgRef.getUuid(), name, applicationId, null);
+ if(!orgName.equals("usergrid")) { //avoid management org
+
+ EntityRef orgRef = managementEm.getAlias(Group.ENTITY_TYPE, orgName);
+ // create and connect new APPLICATION_INFO oldAppInfo to Organization
+ managementService.createApplication(orgRef.getUuid(), name, applicationId, null);
+ }
} else {
//already migrated don't do anything
observer.update(getMaxVersion(), "Received existing application_info for " + appName + " don't do anything");