You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/11/07 23:33:24 UTC
[3/7] tinkerpop git commit: TINKERPOP-1434 Checked for next() prior
to calling iteration complete
TINKERPOP-1434 Checked for next() prior to calling iteration complete
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1c526334
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1c526334
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1c526334
Branch: refs/heads/tp32
Commit: 1c5263341709708e97c040f24a9a11e669901864
Parents: 604d764
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Nov 4 13:34:44 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Nov 4 13:34:44 2016 -0400
----------------------------------------------------------------------
.../gremlin/server/op/traversal/TraversalOpProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c526334/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
index 4b559a3..5edbe26 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
@@ -552,7 +552,7 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
throw ex;
}
- iterateComplete(ctx, msg, itty);
+ if (!itty.hasNext()) iterateComplete(ctx, msg, itty);
// the flush is called after the commit has potentially occurred. in this way, if a commit was
// required then it will be 100% complete before the client receives it. the "frame" at this point