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:26 UTC
[04/35] incubator-usergrid git commit: Identifies the symptom of the
bug
Identifies the symptom of the bug
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/62525861
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/62525861
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/62525861
Branch: refs/heads/rest-test-framework-token-fix
Commit: 62525861cd324bebd11a45481d366b839fdf7098
Parents: 05f8172
Author: Todd Nine <tn...@apigee.com>
Authored: Thu Jun 4 17:31:10 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Thu Jun 4 17:31:10 2015 -0600
----------------------------------------------------------------------
.../usergrid/corepersistence/CpEntityManagerFactory.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/62525861/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 713a2da..762a5cd 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
@@ -307,10 +307,8 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
public void deleteApplication(UUID applicationId) throws Exception {
// find application_info for application to delete
- String collectionFromName = CpNamingUtils.APPLICATION_INFO;
- String collectionToName = CpNamingUtils.DELETED_APPLICATION_INFO;
- migrateAppInfo(applicationId, collectionFromName, collectionToName).toBlocking()
+ migrateAppInfo(applicationId, CpNamingUtils.APPLICATION_INFO, CpNamingUtils.DELETED_APPLICATION_INFO).toBlocking()
.lastOrDefault(null);
}
@@ -387,11 +385,12 @@ public class CpEntityManagerFactory implements EntityManagerFactory, Application
final GraphManager managementGraphManager = managerCache.getGraphManager(managementAppScope);
final Edge createEdge = CpNamingUtils.createCollectionEdge(managementAppId, collectionToName, applicationId);
- final Observable compactObservable = managementGraphManager.compactNode(applicationId);
+ //TODO T.N. Removing this causes a failure
+// final Observable compactObservable = managementGraphManager.compactNode(applicationId);
final Observable deleteNodeGraph = managementGraphManager
- .markNode(applicationId, CpNamingUtils.createGraphOperationTimestamp())
- .flatMap(id -> compactObservable);
+ .markNode( applicationId, CpNamingUtils.createGraphOperationTimestamp() );
+// .flatMap(id -> compactObservable);
final Observable createNodeGraph = managementGraphManager.writeEdge(createEdge);