fixed a GroupStep serialization bug that was introduced many tickets ago -- don't know why we didn't notice it. simple fix.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ad01fa1e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ad01fa1e Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ad01fa1e Branch: refs/heads/TINKERPOP-1502 Commit: ad01fa1efff39f9a19a7afc70023d1cad203c29b Parents: d0f0202 Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Mon Nov 14 16:14:43 2016 -0700 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Mon Nov 14 16:14:55 2016 -0700 ---------------------------------------------------------------------- .../tinkerpop/gremlin/process/traversal/step/map/GroupStep.java | 3 +-- .../process/traversal/step/sideEffect/GroupSideEffectStep.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ad01fa1e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java index 174c1ad..7d80d69 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroupStep.java @@ -130,8 +130,7 @@ public final class GroupStep<S, K, V> extends ReducingBarrierStep<S, Map<K, V>> if (null != this.keyTraversal) clone.keyTraversal = this.keyTraversal.clone(); clone.valueTraversal = this.valueTraversal.clone(); - if (null != this.preTraversal) - clone.preTraversal = this.preTraversal.clone(); + clone.preTraversal = (Traversal.Admin<S, ?>) GroupStep.generatePreTraversal(clone.valueTraversal); return clone; } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ad01fa1e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java index cf69c4c..0e8a4f5 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupSideEffectStep.java @@ -121,8 +121,7 @@ public final class GroupSideEffectStep<S, K, V> extends SideEffectStep<S> implem if (null != this.keyTraversal) clone.keyTraversal = this.keyTraversal.clone(); clone.valueTraversal = this.valueTraversal.clone(); - if (null != this.preTraversal) - clone.preTraversal = this.preTraversal.clone(); + clone.preTraversal = (Traversal.Admin<S, ?>) GroupStep.generatePreTraversal(clone.valueTraversal); return clone; }
