You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2016/06/14 19:22:47 UTC
usergrid git commit: Fix merge problem and ensure entityManagers is
created before use
Repository: usergrid
Updated Branches:
refs/heads/usergrid-1268-akka-211 a93cad8fa -> de2437373
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/usergrid-1268-akka-211
Commit: de24373739df90586ac7dc74c02dff0657bc4ec7
Parents: a93cad8
Author: Dave Johnson <sn...@apache.org>
Authored: Tue Jun 14 15:22:45 2016 -0400
Committer: Dave Johnson <sn...@apache.org>
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 );
}