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 2D40A18DCF for ; Fri, 26 Jun 2015 08:46:52 +0000 (UTC) Received: (qmail 51405 invoked by uid 500); 26 Jun 2015 08:46:52 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 51372 invoked by uid 500); 26 Jun 2015 08:46:52 -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 51363 invoked by uid 99); 26 Jun 2015 08:46:52 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 26 Jun 2015 08:46:52 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id A3F7D1A6135 for ; Fri, 26 Jun 2015 08:46:51 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-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 (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id BFc_CGYVrRik for ; Fri, 26 Jun 2015 08:46:43 +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 B95482095A for ; Fri, 26 Jun 2015 08:46:42 +0000 (UTC) Received: (qmail 50812 invoked by uid 99); 26 Jun 2015 08:46:42 -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, 26 Jun 2015 08:46:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D4101DFE13; Fri, 26 Jun 2015 08:46:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 26 Jun 2015 08:46:44 -0000 Message-Id: <4cf95fecc86b4ad59f803d1571333fb9@git.apache.org> In-Reply-To: <72fc2b03bb12443688d16b8b2de7e144@git.apache.org> References: <72fc2b03bb12443688d16b8b2de7e144@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/20] incubator-ignite git commit: #IGNITE-GG-10440 Changed tests. #IGNITE-GG-10440 Changed tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5b306e1a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5b306e1a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5b306e1a Branch: refs/heads/ignite-gg-10424 Commit: 5b306e1a035c94be6dcb357635d07ce7eaba84c0 Parents: 76f5377 Author: nikolay_tikhonov Authored: Mon Jun 22 17:17:44 2015 +0300 Committer: nikolay_tikhonov Committed: Mon Jun 22 17:17:44 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/GridKernalContextImpl.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5b306e1a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java index 7b07593..737dbee 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java @@ -790,6 +790,8 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable if (cls.equals(IgniteCacheObjectProcessor.class)) return (T)new IgniteCacheObjectProcessorImpl(this); + if (cls.equals(CacheConflictResolutionManager.class)) + return null; throw new IgniteException("Unsupported component type: " + cls); }