revert to master/ representation of GroupStep. TINKERPOP-1590 has the clone 
safe model.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0ec23ba9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0ec23ba9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0ec23ba9

Branch: refs/heads/TINKERPOP-1564
Commit: 0ec23ba9fc4d7a1847f09c1ee7ab22fe79127ca9
Parents: 49f729b
Author: Marko A. Rodriguez <[email protected]>
Authored: Wed Jan 4 06:00:27 2017 -0700
Committer: Marko A. Rodriguez <[email protected]>
Committed: Wed Jan 4 06:00:27 2017 -0700

----------------------------------------------------------------------
 .../gremlin/process/traversal/step/map/GroupStep.java         | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0ec23ba9/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 a037667..da830ae 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,9 +130,9 @@ 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();
-        // clone.preTraversal = (Traversal.Admin<S, ?>) 
GroupStep.generatePreTraversal(clone.valueTraversal);
-        if (null != this.preTraversal)
-            clone.preTraversal = this.preTraversal.clone();
+        clone.preTraversal = (Traversal.Admin<S, ?>) 
GroupStep.generatePreTraversal(clone.valueTraversal);
+        /*if (null != this.preTraversal)
+            clone.preTraversal = this.preTraversal.clone();*/
         return clone;
     }
 
@@ -381,4 +381,3 @@ public final class GroupStep<S, K, V> extends 
ReducingBarrierStep<S, Map<K, V>>
     }
 }
 
-

Reply via email to