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/05/16 13:27:51 UTC
[5/6] incubator-tinkerpop git commit: dar. in my frantic 'get me back
to where I was'-state, I forgot to add back this line. ... yes,
its been hell this morning.
dar. in my frantic 'get me back to where I was'-state, I forgot to add back this line. ... yes, its been hell this morning.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/01058f44
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/01058f44
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/01058f44
Branch: refs/heads/master
Commit: 01058f44e029eda04a228e059e5a4b632c507363
Parents: 282177b
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu May 12 13:06:36 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu May 12 13:06:36 2016 -0600
----------------------------------------------------------------------
.../gremlin/process/computer/traversal/TraversalVertexProgram.java | 1 +
.../process/computer/traversal/step/map/VertexProgramStep.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/01058f44/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
index 4912dbe..4df5189 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
@@ -182,6 +182,7 @@ public final class TraversalVertexProgram implements VertexProgram<TraverserSet<
MasterExecutor.processTraversers(this.traversal, this.traversalMatrix, toProcessTraversers, remoteActiveTraversers, haltedTraversers);
memory.set(HALTED_TRAVERSERS, haltedTraversers);
memory.set(ACTIVE_TRAVERSERS, remoteActiveTraversers);
+ sideEffects.remove(TraversalVertexProgram.HALTED_TRAVERSERS);
} else {
memory.set(HALTED_TRAVERSERS, new TraverserSet<>());
memory.set(ACTIVE_TRAVERSERS, new TraverserSet<>());
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/01058f44/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/VertexProgramStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/VertexProgramStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/VertexProgramStep.java
index eaf06c4..c535d30 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/VertexProgramStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/VertexProgramStep.java
@@ -125,7 +125,7 @@ public abstract class VertexProgramStep extends AbstractStep<ComputerResult, Com
sideEffects.set(key, memory.get(key));
}
}
- if (memory.exists(TraversalVertexProgram.HALTED_TRAVERSERS)) {
+ if (memory.exists(TraversalVertexProgram.HALTED_TRAVERSERS) && !this.isEndStep()) {
final TraverserSet<Object> haltedTraversers = memory.get(TraversalVertexProgram.HALTED_TRAVERSERS);
if (!haltedTraversers.isEmpty()) {
if (sideEffects.exists(TraversalVertexProgram.HALTED_TRAVERSERS))