Fixes NPE issue. Adds additional validation time
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/94579c72 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/94579c72 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/94579c72 Branch: refs/heads/2.1-release Commit: 94579c7213862afa194a7aec78b1a92070e7bbf8 Parents: 591a2f1 Author: Todd Nine <[email protected]> Authored: Thu Nov 5 14:45:53 2015 -0700 Committer: Todd Nine <[email protected]> Committed: Thu Nov 5 14:45:53 2015 -0700 ---------------------------------------------------------------------- .../graph/serialization/impl/shard/DirectedEdgeMeta.java | 4 ++-- .../persistence/graph/GraphManagerShardConsistencyIT.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/94579c72/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/DirectedEdgeMeta.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/DirectedEdgeMeta.java b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/DirectedEdgeMeta.java index 1d81d20..e7143bc 100644 --- a/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/DirectedEdgeMeta.java +++ b/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/shard/DirectedEdgeMeta.java @@ -457,7 +457,7 @@ public abstract class DirectedEdgeMeta { final SearchByIdType search = - new SimpleSearchByIdType( targetId, edgeType, maxValue, order, sourceType, null ); + new SimpleSearchByIdType( targetId, edgeType, maxValue, order, sourceType, Optional.absent() ); return serialization.getEdgesToTargetBySourceType( edgeColumnFamilies, scope, search, shards ); } @@ -517,7 +517,7 @@ public abstract class DirectedEdgeMeta { final String edgeType = types[0]; final SimpleSearchByEdge search = - new SimpleSearchByEdge( sourceId, edgeType, targetId, maxValue, order, null ); + new SimpleSearchByEdge( sourceId, edgeType, targetId, maxValue, order, Optional.absent() ); return serialization.getEdgeVersions( edgeColumnFamilies, scope, search, shards ); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/94579c72/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java index 6aad289..a9f9cb7 100644 --- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java +++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerShardConsistencyIT.java @@ -358,6 +358,11 @@ public class GraphManagerShardConsistencyIT { Thread.sleep( 2000 ); } + + //now continue reading everything for 30 seconds + + Thread.sleep(30000); + executor.shutdownNow(); }
