You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/02/20 03:35:59 UTC
incubator-tinkerpop git commit: minor tweak.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1166 0ae584cae -> cf79c2255
minor tweak.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/cf79c225
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/cf79c225
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/cf79c225
Branch: refs/heads/TINKERPOP-1166
Commit: cf79c2255028d3a2a7dabb4198030b50bfb65417
Parents: 0ae584c
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Feb 19 19:35:52 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Feb 19 19:35:52 2016 -0700
----------------------------------------------------------------------
.../tinkerpop/gremlin/giraph/process/computer/GiraphMemory.java | 4 ++--
.../tinkerpop/gremlin/process/computer/GraphComputerTest.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf79c225/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMemory.java
----------------------------------------------------------------------
diff --git a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMemory.java b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMemory.java
index 05f0e9f..f453b5a 100644
--- a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMemory.java
+++ b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/process/computer/GiraphMemory.java
@@ -138,8 +138,8 @@ public final class GiraphMemory extends MasterCompute implements Memory {
@Override
public boolean exists(final String key) {
- final Object value = this.isMasterCompute ? this.getAggregatedValue(key) : this.worker.getAggregatedValue(key);
- return null != value;
+ final ObjectWritable value = this.isMasterCompute ? this.getAggregatedValue(key) : this.worker.getAggregatedValue(key);
+ return null != value && !value.isEmpty();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cf79c225/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index d33d80d..9c087a9 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -949,7 +949,7 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
@Override
public String getMemoryKey() {
- return MapReduce.NullObject.instance().toString();
+ return "nothing";
}
@Override