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/06/16 21:19:05 UTC

[2/2] incubator-usergrid git commit: change to deleted

change to deleted


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

Branch: refs/heads/two-dot-o-dev
Commit: ee3a1da564cf0986f9d3cc98125c6b21a99511e2
Parents: 25f2e7e
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Jun 16 11:48:51 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Jun 16 11:48:51 2015 -0600

----------------------------------------------------------------------
 .../impl/MvccEntitySerializationStrategyV3Impl.java    | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ee3a1da5/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Impl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Impl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Impl.java
index 1ebe59b..766dc74 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Impl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyV3Impl.java
@@ -258,13 +258,16 @@ public class MvccEntitySerializationStrategyV3Impl implements MvccEntitySerializ
 
     @Override
     public MutationBatch mark( final ApplicationScope applicationScope, final Id entityId, final UUID version ) {
-        Preconditions.checkNotNull( applicationScope, "applicationScope is required" );
-        Preconditions.checkNotNull( entityId, "entity id is required" );
-        Preconditions.checkNotNull( version, "version is required" );
+        Preconditions.checkNotNull(applicationScope, "applicationScope is required");
+        Preconditions.checkNotNull(entityId, "entity id is required");
+        Preconditions.checkNotNull(version, "version is required");
 
 
-        return doWrite( applicationScope, entityId, version, colMutation -> colMutation.putColumn( COL_VALUE, entitySerializer.toByteBuffer(
-            new EntityWrapper(entityId, version, MvccEntity.Status.COMPLETE,VERSION, null ) ) ) );
+        return doWrite(applicationScope, entityId, version, colMutation ->
+                colMutation.putColumn(COL_VALUE,
+                    entitySerializer.toByteBuffer(new EntityWrapper(entityId, version, MvccEntity.Status.DELETED, VERSION, null))
+                )
+        );
     }