Fixed a bug introduced at 3f8577596dee49493a75b039bf16e2e3f8e92793 The bug seemed to allow a driver host to get marked as dead even when it wasn't. This manifested as problems for the RemoteGraph process tests in the 3.2.x line of code, but the problem also existed along 3.1.x generally unnoticed. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2c835c30 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2c835c30 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2c835c30 Branch: refs/heads/master Commit: 2c835c30bc7e672d5c09283dbfe191594dca4170 Parents: ec106fc Author: Stephen Mallette <sp...@genoprime.com> Authored: Wed Jun 15 08:54:41 2016 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Wed Jun 15 08:54:41 2016 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c835c30/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 929cc09..89a0225 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 @@ -99,7 +99,7 @@ final class ResultQueue { // need to peek because the number of available items needs to be >= the expected size for that future. if not // it needs to keep waiting final Pair<CompletableFuture<List<Result>>, Integer> nextWaiting = waiting.peek(); - if (force || (nextWaiting != null && (resultLinkedBlockingQueue.size() >= nextWaiting.getValue1() || readComplete.isDone()))) { + if (nextWaiting != null && (force || (resultLinkedBlockingQueue.size() >= nextWaiting.getValue1() || readComplete.isDone()))) { final int items = nextWaiting.getValue1(); final CompletableFuture<List<Result>> future = nextWaiting.getValue0(); final List<Result> results = new ArrayList<>(items);