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 2017/01/10 22:01:27 UTC
[1/2] tinkerpop git commit: OptionalStep needed a reset() method that
reset its local child.
Repository: tinkerpop
Updated Branches:
refs/heads/master b098328b4 -> 115488754
OptionalStep needed a reset() method that reset its local child.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/372a083c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/372a083c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/372a083c
Branch: refs/heads/master
Commit: 372a083cd8233e552a3983724c43cabcbe512c44
Parents: 64baabf
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jan 10 15:01:13 2017 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jan 10 15:01:13 2017 -0700
----------------------------------------------------------------------
.../gremlin/process/traversal/step/branch/OptionalStep.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/372a083c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/OptionalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/OptionalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/OptionalStep.java
index 2db92da..1e7fb26 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/OptionalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/OptionalStep.java
@@ -89,4 +89,10 @@ public final class OptionalStep<S> extends AbstractStep<S, S> implements Travers
public Set<TraverserRequirement> getRequirements() {
return this.optionalTraversal.getTraverserRequirements();
}
+
+ @Override
+ public void reset() {
+ super.reset();
+ this.optionalTraversal.reset();
+ }
}
[2/2] tinkerpop git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tinkerpop
Posted by ok...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tinkerpop
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/11548875
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/11548875
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/11548875
Branch: refs/heads/master
Commit: 115488754adff17220c1b60ddf5a97cd68faf032
Parents: 372a083 b098328
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jan 10 15:01:21 2017 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jan 10 15:01:21 2017 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../AbstractGraphSONMessageSerializerV2d0.java | 62 +++++++++++++++++++-
.../ser/GraphSONMessageSerializerV2d0Test.java | 23 ++++----
3 files changed, 73 insertions(+), 13 deletions(-)
----------------------------------------------------------------------