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 DDDEC18D59 for ; Wed, 17 Jun 2015 07:47:51 +0000 (UTC) Received: (qmail 25244 invoked by uid 500); 17 Jun 2015 07:47:51 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 25214 invoked by uid 500); 17 Jun 2015 07:47:51 -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 25205 invoked by uid 99); 17 Jun 2015 07:47:51 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jun 2015 07:47:51 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 34F85CE609 for ; Wed, 17 Jun 2015 07:47:51 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.221 X-Spam-Level: * X-Spam-Status: No, score=1.221 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.58, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id zDBhvjCfIIzU for ; Wed, 17 Jun 2015 07:47:39 +0000 (UTC) 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 763A122F03 for ; Wed, 17 Jun 2015 07:47:39 +0000 (UTC) Received: (qmail 24125 invoked by uid 99); 17 Jun 2015 07:47:39 -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, 17 Jun 2015 07:47:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1D3B5E3C77; Wed, 17 Jun 2015 07:47:39 +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, 17 Jun 2015 07:47:44 -0000 Message-Id: In-Reply-To: <47c36692069147578dcb51eb23494826@git.apache.org> References: <47c36692069147578dcb51eb23494826@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/50] incubator-ignite git commit: Release latch in marshaller context in stop method. Release latch in marshaller context in stop method. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e17a2be1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e17a2be1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e17a2be1 Branch: refs/heads/ignite-950 Commit: e17a2be1b931ea6b4e56be653b73a7994fd59898 Parents: e158c90 Author: nikolay_tikhonov Authored: Fri Jun 12 17:13:06 2015 +0300 Committer: nikolay_tikhonov Committed: Fri Jun 12 17:13:06 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/internal/IgniteKernal.java | 2 ++ .../org/apache/ignite/internal/MarshallerContextImpl.java | 7 +++++++ 2 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e17a2be1/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 9b2ae27..9da3346 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -1705,6 +1705,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { List comps = ctx.components(); + ctx.marshallerContext().onKernalStop(); + // Callback component in reverse order while kernal is still functional // if called in the same thread, at least. for (ListIterator it = comps.listIterator(comps.size()); it.hasPrevious();) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e17a2be1/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java index 7940e95..48f24ac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java @@ -83,6 +83,13 @@ public class MarshallerContextImpl extends MarshallerContextAdapter { latch.countDown(); } + /** + * Release marshaller context. + */ + public void onKernalStop() { + latch.countDown(); + } + /** {@inheritDoc} */ @Override protected boolean registerClassName(int id, String clsName) throws IgniteCheckedException { GridCacheAdapter cache0 = cache;