Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id ED06A17E0D for ; Fri, 19 Jun 2015 12:23:35 +0000 (UTC) Received: (qmail 25151 invoked by uid 500); 19 Jun 2015 12:23:35 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 25119 invoked by uid 500); 19 Jun 2015 12:23:35 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 25110 invoked by uid 99); 19 Jun 2015 12:23:35 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jun 2015 12:23:35 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 75F5818019D for ; Fri, 19 Jun 2015 12:23:35 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 67o-L4P6rFx6 for ; Fri, 19 Jun 2015 12:23:27 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 91AC720F3F for ; Fri, 19 Jun 2015 12:23:26 +0000 (UTC) Received: (qmail 24782 invoked by uid 99); 19 Jun 2015 12:23:25 -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; Fri, 19 Jun 2015 12:23:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 41725E027D; Fri, 19 Jun 2015 12:23:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 19 Jun 2015 12:23:25 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/6] incubator-ignite git commit: # ignite-sprint-7 Repository: incubator-ignite Updated Branches: refs/heads/ignite-980 6452ec4fe -> acc2cb944 # ignite-sprint-7 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6974a8e3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6974a8e3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6974a8e3 Branch: refs/heads/ignite-980 Commit: 6974a8e3d356a1e1b777064ae79cb0f67a50a077 Parents: 9458f12 Author: sboikov Authored: Fri Jun 19 12:16:49 2015 +0300 Committer: sboikov Committed: Fri Jun 19 12:16:49 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/processors/task/GridTaskProcessor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6974a8e3/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java index bb9ff50..d59a51d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java @@ -1175,7 +1175,8 @@ public class GridTaskProcessor extends GridProcessorAdapter { ctx.closure().runLocalSafe(new Runnable() { @Override public void run() { - lock.readLock(); + if (!lock.tryReadLock()) + return; try { for (GridTaskWorker task : tasks.values())