You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/03/18 14:31:12 UTC

[24/50] incubator-tinkerpop git commit: Fixed a bug in waiting futures for the driver ResultQueue.

Fixed a bug in waiting futures for the driver ResultQueue.

if the client queued a CompletableFuture waiting for results before errors occurred on the server, the CompletableFuture would complete() successfully with an empty result instead of an error.


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

Branch: refs/heads/master
Commit: 5d62bd637453dc3374b36cd4c64e88fe53301ea6
Parents: 51223cc
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Mar 16 14:53:51 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Mar 17 17:01:35 2016 -0400

----------------------------------------------------------------------
 .../org/apache/tinkerpop/gremlin/driver/ResultQueue.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/5d62bd63/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
index 1a55edc..da6a008 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
@@ -124,10 +124,17 @@ final class ResultQueue {
         flushed.set(true);
     }
 
-    private static void internalDrain(final int items, final CompletableFuture<List<Result>> result,
+    private void internalDrain(final int items, final CompletableFuture<List<Result>> result,
                                       final LinkedBlockingQueue<Result> resultLinkedBlockingQueue) {
         final List<Result> results = new ArrayList<>(items);
         resultLinkedBlockingQueue.drainTo(results, items);
-        result.complete(results);
+
+        // it's important to check for error here because a future may have already been queued in "waiting" prior
+        // to the first response back from the server. if that happens, any "waiting" futures should be completed
+        // exceptionally otherwise it will look like success.
+        if (null == error.get())
+            result.complete(results);
+        else
+            result.completeExceptionally(error.get());
     }
 }