Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 45C48200B47 for ; Sat, 2 Jul 2016 15:40:17 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 449E5160A5D; Sat, 2 Jul 2016 13:40:17 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9590F160A6F for ; Sat, 2 Jul 2016 15:40:16 +0200 (CEST) Received: (qmail 15175 invoked by uid 500); 2 Jul 2016 13:40:15 -0000 Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.apache.org Delivered-To: mailing list commits@tinkerpop.apache.org Received: (qmail 15154 invoked by uid 99); 2 Jul 2016 13:40:15 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Jul 2016 13:40:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 57592E943B; Sat, 2 Jul 2016 13:40:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: okram@apache.org To: commits@tinkerpop.apache.org Date: Sat, 02 Jul 2016 13:40:19 -0000 Message-Id: In-Reply-To: <92bbc05bbc1349889c2cbc065f84a40d@git.apache.org> References: <92bbc05bbc1349889c2cbc065f84a40d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/11] tinkerpop git commit: Cancellation of a timeout should occur in existing thread pool archived-at: Sat, 02 Jul 2016 13:40:17 -0000 Cancellation of a timeout should occur in existing thread pool Prior to this change, the cancellation of a timeout occured in the ForkJoinPool when an existing thread pool in the GremlinExecutor was present to handle that job. CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d699cb6c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d699cb6c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d699cb6c Branch: refs/heads/TINKERPOP-1278 Commit: d699cb6c00ccef02a7b93948cf185a61481dc12b Parents: 8c04d61 Author: Stephen Mallette Authored: Tue Jun 28 13:59:36 2016 -0400 Committer: Stephen Mallette Committed: Tue Jun 28 13:59:36 2016 -0400 ---------------------------------------------------------------------- .../apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d699cb6c/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java ---------------------------------------------------------------------- diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java index 2476114..63721eb 100644 --- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java +++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java @@ -310,7 +310,7 @@ public class GremlinExecutor implements AutoCloseable { evaluationFuture.handleAsync((v, t) -> { logger.debug("Killing scheduled timeout on script evaluation as the eval completed (possibly with exception)."); return sf.cancel(true); - }); + }, scheduledExecutorService); } return evaluationFuture;