usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [10/35] git commit: Switching back to using ecm.write() instead of ecm.update() because using update() breaks the Core module tests.
Date Wed, 01 Oct 2014 14:51:46 GMT
Switching back to using ecm.write() instead of ecm.update() because using update() breaks the
Core module tests.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/16cc4dff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/16cc4dff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/16cc4dff

Branch: refs/heads/two-dot-o-rebuildable-index
Commit: 16cc4dffd0ca59053e2363927459e8cc838fa9b4
Parents: 38eb9e4
Author: Dave Johnson <dmjohnson@apigee.com>
Authored: Sun Sep 28 11:44:16 2014 -0400
Committer: Dave Johnson <dmjohnson@apigee.com>
Committed: Sun Sep 28 11:44:16 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/usergrid/corepersistence/CpEntityManager.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/16cc4dff/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index 5a5e6bc..f85ba30 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@ -503,7 +503,8 @@ public class CpEntityManager implements EntityManager {
             logger.debug("About to Write {}:{} version {}", new Object[] { 
                 cpEntity.getId().getType(), cpEntity.getId().getUuid(), cpEntity.getVersion()
});
 
-            cpEntity = ecm.update( cpEntity ).toBlockingObservable().last();
+            // using ecm.update() here causes Core tests to fail
+            cpEntity = ecm.write( cpEntity ).toBlockingObservable().last();
 
             logger.debug("Wrote {}:{} version {}", new Object[] { 
                 cpEntity.getId().getType(), cpEntity.getId().getUuid(), cpEntity.getVersion()
});


Mime
View raw message