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 B461A17927 for ; Thu, 30 Apr 2015 14:55:44 +0000 (UTC) Received: (qmail 86881 invoked by uid 500); 30 Apr 2015 14:55:44 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 86850 invoked by uid 500); 30 Apr 2015 14:55:44 -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 86841 invoked by uid 99); 30 Apr 2015 14:55:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Apr 2015 14:55:44 +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.164.171.186] (HELO mx1-us-east.apache.org) (54.164.171.186) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 30 Apr 2015 14:55:38 +0000 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 5281147393 for ; Thu, 30 Apr 2015 14:54:09 +0000 (UTC) Received: (qmail 81334 invoked by uid 99); 30 Apr 2015 14:54:08 -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; Thu, 30 Apr 2015 14:54:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DC335E3A57; Thu, 30 Apr 2015 14:54:08 +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: Thu, 30 Apr 2015 14:54:57 -0000 Message-Id: <8719a75f8dfa4328a2140bb69929a859@git.apache.org> In-Reply-To: <2045542d955e44dc9b090b1a9a973eaa@git.apache.org> References: <2045542d955e44dc9b090b1a9a973eaa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [50/50] incubator-ignite git commit: #ignite-732: wip. X-Virus-Checked: Checked by ClamAV on apache.org #ignite-732: wip. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d04bc6d4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d04bc6d4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d04bc6d4 Branch: refs/heads/ignite-732 Commit: d04bc6d4ae5575fad3b704db390bc493a9f7f270 Parents: b5b433a Author: ivasilinets Authored: Thu Apr 30 17:53:42 2015 +0300 Committer: ivasilinets Committed: Thu Apr 30 17:53:42 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/processors/cache/GridCacheAdapter.java | 3 +++ .../ignite/internal/processors/cache/GridCacheProcessor.java | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d04bc6d4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 46d248a..3e203c1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -4965,6 +4965,9 @@ public abstract class GridCacheAdapter implements IgniteInternalCache extends GlobalClearKeySetCallable { + /** */ + private static final long serialVersionUID = 0L; + /** * @param cacheName Cache name. * @param topVer Affinity topology version. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d04bc6d4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 9003b11..c0026ab 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -739,8 +739,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { } } - - ctx.marshallerContext().onMarshallerCacheStarted(ctx); marshallerCache().context().preloader().syncFuture().listen(new CIX1>() {