tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spmalle...@apache.org
Subject [50/50] incubator-tinkerpop git commit: The logic for is.testing was reversed somehow.
Date Wed, 16 Mar 2016 14:40:32 GMT
The logic for is.testing was reversed somehow.

The "attaching" iterator needs to be used when testing is enabled.


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

Branch: refs/heads/TINKERPOP-575
Commit: 8bea4bb5ed1f06d21c531a31517f7f86ea2ff349
Parents: 6e7f595
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Wed Mar 16 10:38:34 2016 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Wed Mar 16 10:38:34 2016 -0400

----------------------------------------------------------------------
 .../gremlin/driver/remote/DriverRemoteConnection.java          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8bea4bb5/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
index c900523..50422b3 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
@@ -155,12 +155,12 @@ public class DriverRemoteConnection implements RemoteConnection {
     @Override
     public Iterator<Traverser> submit(final Traversal t) throws RemoteConnectionException
{
         try {
-            if (attachElements)
-                return new TraverserIterator(client.submit(t).iterator());
-            else {
+            if (attachElements) {
                 if (!conf.isPresent()) throw new IllegalStateException("Traverser can't be
reattached for testing");
                 final Graph graph = ((Supplier<Graph>) conf.get().getProperty("hidden.for.testing.only")).get();
                 return new AttachingTraverserIterator(client.submit(t).iterator(), graph);
+            } else {
+                return new TraverserIterator(client.submit(t).iterator());
             }
         } catch (Exception ex) {
             throw new RemoteConnectionException(ex);


Mime
View raw message