You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/04/07 22:21:59 UTC
[08/28] git commit: Pushing relevant code to github so Dave can see
issue on line 386
Pushing relevant code to github so Dave can see issue on line 386
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/596147a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/596147a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/596147a5
Branch: refs/heads/two-dot-o
Commit: 596147a5ee95c0b97e0e025026951da6a4bbda1e
Parents: 0d544e3
Author: grey <gr...@apigee.com>
Authored: Mon Mar 17 11:11:40 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Mar 17 11:11:40 2014 -0700
----------------------------------------------------------------------
.../impl/MvccEntitySerializationStrategyImpl.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/596147a5/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
index 1db0ac0..d68b1aa 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/impl/MvccEntitySerializationStrategyImpl.java
@@ -23,6 +23,7 @@ import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.UUID;
@@ -377,12 +378,12 @@ public class MvccEntitySerializationStrategyImpl implements MvccEntitySerializat
return new EntityWrapper( MvccEntity.Status.COMPLETE, Optional.<Entity>absent() );
}
- Object storedObject = null;
+ LinkedHashMap storedObject = null;
Entity storedEntity = null;
String derper = null;
- byteBuffer.position( 9 );
+ byteBuffer.position( 0 );
try {
- storedObject = mapper.readValue( helper,Object.class);
+ storedEntity = mapper.readValue( helper,Entity.class);
}
catch ( IOException e ) {
e.printStackTrace();