usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [1/7] incubator-usergrid git commit: Identifies the symptom of the bug
Date Wed, 10 Jun 2015 15:47:11 GMT
Repository: incubator-usergrid
Updated Branches:
  refs/heads/two-dot-o-dev 15641d137 -> a1b231888


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/two-dot-o-dev
Commit: 62525861cd324bebd11a45481d366b839fdf7098
Parents: 05f8172
Author: Todd Nine <tnine@apigee.com>
Authored: Thu Jun 4 17:31:10 2015 -0600
Committer: Todd Nine <tnine@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);
 


Mime
View raw message