You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/06/10 18:45:46 UTC
[24/35] incubator-usergrid git commit: Removed unnecessary steps
Removed unnecessary steps
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/951c73c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/951c73c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/951c73c5
Branch: refs/heads/rest-test-framework-token-fix
Commit: 951c73c5e9e091b44bc73b909e8f68083785c7a0
Parents: 332bfbe
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Jun 9 15:15:58 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Jun 9 15:15:58 2015 -0600
----------------------------------------------------------------------
.../usergrid/corepersistence/CpEntityManagerFactory.java | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/951c73c5/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 ef1ffc0..768ca8d 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
@@ -410,19 +410,12 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
final GraphManager managementGraphManager = managerCache.getGraphManager(managementAppScope);
final Edge createEdge = CpNamingUtils.createCollectionEdge(managementAppId, createCollectionName, createApplicationId);
- //TODO T.N. Removing this causes a failure
-// final Observable compactObservable = managementGraphManager.compactNode(applicationId);
-
- final Observable deleteNodeGraph = managementGraphManager
- .markNode( deleteApplicationId, CpNamingUtils.createGraphOperationTimestamp() );
-// .flatMap(id -> compactObservable);
-
final Observable createNodeGraph = managementGraphManager.writeEdge(createEdge);
final Observable deleteAppFromIndex = aei.deleteApplication();
return Observable
- .merge( copyConnections, createNodeGraph, deleteNodeGraph, deleteAppFromIndex )
+ .merge( copyConnections, createNodeGraph, deleteAppFromIndex )
.doOnCompleted( () -> {
try {
if ( oldAppEntity != null ) {
@@ -430,6 +423,7 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
applicationIdCache.evictAppId( oldAppEntity.getName() );
}
entityIndex.refreshAsync().toBlocking().last();
+
}
catch ( Exception e ) {
throw new RuntimeException( e );