You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/03/20 22:22:45 UTC
[13/29] incubator-usergrid git commit: fix dependency
fix dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/70fe2851
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/70fe2851
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/70fe2851
Branch: refs/heads/USERGRID-405
Commit: 70fe28512b20e2c5537c27424f18299a5bb3b58c
Parents: 532b662 8ea46ba
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Mar 19 14:40:28 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Mar 19 14:40:28 2015 -0600
----------------------------------------------------------------------
.../apache/usergrid/corepersistence/CpEntityManager.java | 3 ---
.../usergrid/corepersistence/CpEntityManagerFactory.java | 9 ++++-----
2 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/70fe2851/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index b23111a,789e640..a9f00b4
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@@ -2889,9 -2886,10 +2889,6 @@@ public class CpEntityManager implement
// refresh factory indexes
emf.refreshIndex();
--
-- // refresh this Entity Manager's application's index
- EntityIndex ei = managerCache.getEntityIndex( getApplicationScope() );
-- ei.refresh();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/70fe2851/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
index 14b7865,f76b9fc..f3d18d0
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
@@@ -128,7 -126,6 +128,7 @@@ public class CpEntityManagerFactory imp
this.cassandraService = cassandraService;
this.counterUtils = counterUtils;
this.injector = injector;
- this.entityIndex = entityIndex;
++ this.entityIndex = injector.getInstance(EntityIndex.class);
this.managerCache = injector.getInstance( ManagerCache.class );
this.metricsFactory = injector.getInstance( MetricsFactory.class );
@@@ -664,8 -663,10 +664,7 @@@
// refresh special indexes without calling EntityManager refresh because stack overflow
maybeCreateIndexes();
// system app
--
- entityIndex.refresh();
- for ( EntityIndex index : getManagementIndexes() ) {
- index.refresh();
- }
++ entityIndex.refresh();
}
@@@ -675,7 -676,9 +674,7 @@@
return;
}
- entityIndex.initializeIndex();
- for ( EntityIndex index : getManagementIndexes() ) {
- index.initializeIndex();
- }
++// entityIndex.initializeIndex();
}