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 2016/02/15 20:47:47 UTC
[2/2] incubator-tinkerpop git commit: merged TINKERPOP-1105 fix.
merged TINKERPOP-1105 fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2326b040
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2326b040
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2326b040
Branch: refs/heads/master
Commit: 2326b04050ddb075065668e8504cc4c7ea06dd29
Parents: dac0f48 ba0b7b7
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Feb 15 12:47:42 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Feb 15 12:47:42 2016 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../process/computer/traversal/step/map/ComputerResultStep.java | 2 +-
.../tinkerpop/gremlin/structure/io/gryo/GryoSerializers.java | 2 +-
.../tinkerpop/gremlin/structure/util/detached/DetachedVertex.java | 3 +--
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2326b040/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2326b040/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
index 86dce91,1855c30..d2b1af7
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/step/map/ComputerResultStep.java
@@@ -107,11 -129,4 +107,11 @@@ public final class ComputerResultStep<S
public Set<TraverserRequirement> getRequirements() {
return EnumSet.of(TraverserRequirement.OBJECT);
}
+
+ @Override
+ public ComputerResultStep<S> clone() {
- final ComputerResultStep<S> clone = (ComputerResultStep<S>)super.clone();
++ final ComputerResultStep<S> clone = (ComputerResultStep<S>) super.clone();
+ clone.currentIterator = EmptyIterator.instance();
+ return clone;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2326b040/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java
index 1c5ee92,419003a..371c091
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedVertex.java
@@@ -22,7 -22,7 +22,6 @@@ import org.apache.tinkerpop.gremlin.str
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Graph;
--import org.apache.tinkerpop.gremlin.structure.Property;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;