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 9534917CCC for ; Wed, 22 Apr 2015 15:14:30 +0000 (UTC) Received: (qmail 38742 invoked by uid 500); 22 Apr 2015 15:14:21 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 38711 invoked by uid 500); 22 Apr 2015 15:14:21 -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 38627 invoked by uid 99); 22 Apr 2015 15:14:21 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 15:14:21 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [54.191.145.13] (HELO mx1-us-west.apache.org) (54.191.145.13) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 Apr 2015 15:14:16 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 2216624A48 for ; Wed, 22 Apr 2015 15:13:56 +0000 (UTC) Received: (qmail 37363 invoked by uid 99); 22 Apr 2015 15:13:56 -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; Wed, 22 Apr 2015 15:13:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DE2C3E024E; Wed, 22 Apr 2015 15:13:55 +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: Wed, 22 Apr 2015 15:13:55 -0000 Message-Id: <7ef3f9f14377432ba54e5b3f7d517f13@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/6] incubator-ignite git commit: holdcc/callcc fix discovered by visor X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-ignite Updated Branches: refs/heads/ignite-774 8607e76ce -> ad333fb66 holdcc/callcc fix discovered by visor Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0cf0dae9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0cf0dae9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0cf0dae9 Branch: refs/heads/ignite-774 Commit: 0cf0dae9e22e27aa840cdc8acbd9362d5636bfda Parents: 3d90d84 Author: Denis Magda Authored: Wed Apr 22 15:29:55 2015 +0300 Committer: Denis Magda Committed: Wed Apr 22 15:29:55 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/job/GridJobProcessor.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0cf0dae9/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java index a13e170..48e9686 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java @@ -1639,6 +1639,9 @@ public class GridJobProcessor extends GridProcessorAdapter { if (log.isDebugEnabled()) log.debug("Received onHeld() callback [worker=" + worker + ']'); + if (worker.isInternal()) + return true; + boolean res = false; if (activeJobs.containsKey(worker.getJobId())) { @@ -1661,6 +1664,9 @@ public class GridJobProcessor extends GridProcessorAdapter { log.debug("Received onUnheld() callback [worker=" + worker + ", active=" + activeJobs + ", held=" + heldJobs + ']'); + if (worker.isInternal()) + return true; + return heldJobs.remove(worker.getJobId()); } }