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/08/04 22:40:35 UTC
[06/24] tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Merge remote-tracking branch 'origin/tp31'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0f5f2d81
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0f5f2d81
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0f5f2d81
Branch: refs/heads/TINKERPOP-1278
Commit: 0f5f2d81e27956d7d546bc53e4edcc450c0030c3
Parents: 3135c30 168097b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 27 08:02:46 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 27 08:02:46 2016 -0400
----------------------------------------------------------------------
.../process/traversal/step/util/ExpandableStepIterator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0f5f2d81/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
index dc61ad2,09e82d0..30558e8
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/ExpandableStepIterator.java
@@@ -28,12 -29,13 +28,12 @@@ import java.util.Iterator
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
- public class ExpandableStepIterator<S> implements Iterator<Traverser.Admin<S>>, Serializable {
+ public final class ExpandableStepIterator<S> implements Iterator<Traverser.Admin<S>>, Serializable {
private final TraverserSet<S> traverserSet = new TraverserSet<>();
- private final MultiIterator<Traverser.Admin<S>> traverserIterators = new MultiIterator<>();
- private final Step<S,?> hostStep;
+ private final Step<S, ?> hostStep;
- public ExpandableStepIterator(final Step<S,?> hostStep) {
+ public ExpandableStepIterator(final Step<S, ?> hostStep) {
this.hostStep = hostStep;
}