tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [47/50] incubator-tinkerpop git commit: Fixed compile errors given some api changes from master.
Date Thu, 17 Mar 2016 20:24:04 GMT
Fixed compile errors given some api changes from master.


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

Branch: refs/heads/TINKERPOP-575
Commit: 28a61c84a082bd478c797370b049f786e05de4e3
Parents: b674810
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Thu Mar 17 14:44:32 2016 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Thu Mar 17 14:44:32 2016 -0400

----------------------------------------------------------------------
 .../gremlin/process/remote/traversal/step/map/RemoteStep.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/28a61c84/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
index 1f101d9..2b75c99 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/traversal/step/map/RemoteStep.java
@@ -20,13 +20,10 @@ package org.apache.tinkerpop.gremlin.process.remote.traversal.step.map;
 
 import org.apache.tinkerpop.gremlin.process.remote.RemoteConnection;
 import org.apache.tinkerpop.gremlin.process.remote.RemoteConnectionException;
-import org.apache.tinkerpop.gremlin.process.remote.RemoteGraph;
 import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.AbstractStep;
 import org.apache.tinkerpop.gremlin.process.traversal.util.PureTraversal;
-import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
 
 import java.util.Iterator;
@@ -56,7 +53,7 @@ public class RemoteStep<S,E> extends AbstractStep<S, E> {
 
     @SuppressWarnings("unchecked")
     @Override
-    protected Traverser processNextStart() throws NoSuchElementException {
+    protected Traverser.Admin<E> processNextStart() throws NoSuchElementException {
 
         if (null == currentIterator) {
             try {
@@ -70,6 +67,6 @@ public class RemoteStep<S,E> extends AbstractStep<S, E> {
             }
         }
 
-        return this.currentIterator.next();
+        return this.currentIterator.next().asAdmin();
     }
 }


Mime
View raw message