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 2014/09/11 00:01:46 UTC
git commit: uuid fix
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o 0a9c9540d -> acfe1b4bc
uuid fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/acfe1b4b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/acfe1b4b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/acfe1b4b
Branch: refs/heads/two-dot-o
Commit: acfe1b4bc6d5fb2cf28ac0077b5b9e508ecd3831
Parents: 0a9c954
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Sep 10 16:01:28 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Sep 10 16:01:28 2014 -0600
----------------------------------------------------------------------
.../org/apache/usergrid/corepersistence/CpRelationManager.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/acfe1b4b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
index ebd417b..c5fd7ca 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
@@ -680,8 +680,8 @@ public class CpRelationManager implements RelationManager {
edgeType,
headEntity.getType(), headEntity.getUuid(),
itemRef.getType(), itemRef.getUuid() });
-
- long uuidHash = UUIDUtils.getUUIDLong( memberEntity.getId().getUuid());
+ UUID timeStampUuid = memberEntity.getId().getUuid() != null && UUIDUtils.isTimeBased( memberEntity.getId().getUuid()) ? memberEntity.getId().getUuid() : UUIDUtils.newTimeUUID();
+ long uuidHash = UUIDUtils.getUUIDLong(timeStampUuid);
// create graph edge connection from head entity to member entity
Edge edge = new SimpleEdge(
cpHeadEntity.getId(),