Fix merge problem and ensure entityManagers is created before use
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/de243737 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/de243737 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/de243737 Branch: refs/heads/release-2.1.1 Commit: de24373739df90586ac7dc74c02dff0657bc4ec7 Parents: a93cad8 Author: Dave Johnson <[email protected]> Authored: Tue Jun 14 15:22:45 2016 -0400 Committer: Dave Johnson <[email protected]> Committed: Tue Jun 14 15:22:45 2016 -0400 ---------------------------------------------------------------------- .../corepersistence/CpEntityManagerFactory.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/de243737/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 090400f..8e8c5e8 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 @@ -129,17 +129,19 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application this.graphManagerFactory = injector.getInstance( GraphManagerFactory.class ); this.collectionService = injector.getInstance( CollectionService.class ); this.connectionService = injector.getInstance( ConnectionService.class ); - this.collectionSettingsCacheFactory = injector.getInstance( CollectionSettingsCacheFactory.class ); + Properties properties = cassandraService.getProperties(); + this.entityManagers = createEntityManagerCache( properties ); + AkkaFig akkaFig = injector.getInstance( AkkaFig.class ); - // this line always needs to be last due to the temporary cicular dependency until spring is removed - this.applicationIdCache = injector.getInstance(ApplicationIdCacheFactory.class).getInstance( - getManagementEntityManager() ); + + logger.info("EntityManagerFactoring starting..."); if ( akkaFig.getAkkaEnabled() ) { try { + logger.info("Akka cluster starting..."); this.uniqueValuesService = injector.getInstance( UniqueValuesService.class ); this.uniqueValuesService.start(); } catch (Throwable t) { @@ -149,9 +151,11 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application } this.lockManager = injector.getInstance( LockManager.class ); - Properties properties = cassandraService.getProperties(); - entityManagers = createEntityManagerCache( properties ); + + // this line always needs to be last due to the temporary cicular dependency until spring is removed + this.applicationIdCache = injector.getInstance(ApplicationIdCacheFactory.class).getInstance( + getManagementEntityManager() ); checkManagementApp( properties ); }
