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 49D4A17CB4 for ; Wed, 15 Apr 2015 06:17:37 +0000 (UTC) Received: (qmail 28462 invoked by uid 500); 15 Apr 2015 06:17:37 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 28434 invoked by uid 500); 15 Apr 2015 06:17:37 -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 28425 invoked by uid 99); 15 Apr 2015 06:17:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Apr 2015 06:17:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 15 Apr 2015 06:17:35 +0000 Received: (qmail 27430 invoked by uid 99); 15 Apr 2015 06:17:15 -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, 15 Apr 2015 06:17:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AB82EE0414; Wed, 15 Apr 2015 06:17:15 +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, 15 Apr 2015 06:17:16 -0000 Message-Id: <80cbee54a1634848a8f6ce70da5c22e9@git.apache.org> In-Reply-To: <4e3e244e025f46d9bfecd857104d614d@git.apache.org> References: <4e3e244e025f46d9bfecd857104d614d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] incubator-ignite git commit: # ignite-742 allow CachePartialUpdateException in test X-Virus-Checked: Checked by ClamAV on apache.org # ignite-742 allow CachePartialUpdateException in test Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1a0ff8f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a0ff8f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a0ff8f1 Branch: refs/heads/ignite-sprint-4 Commit: 1a0ff8f154a6bfc853139fc50e09ca14065e1ef6 Parents: 596535b Author: sboikov Authored: Tue Apr 14 17:32:08 2015 +0300 Committer: sboikov Committed: Tue Apr 14 17:32:46 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAbstractFailoverSelfTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a0ff8f1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java index 0887ee9..4cb7365 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFailoverSelfTest.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.cluster.*; @@ -246,8 +247,7 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac cache.put("key" + i, i); } catch (CacheException e) { - // It is ok to fail with topology exception. - if (!X.hasCause(e, ClusterTopologyCheckedException.class)) + if (!X.hasCause(e, ClusterTopologyCheckedException.class) && !(e instanceof CachePartialUpdateException)) throw e; } } @@ -297,8 +297,7 @@ public abstract class GridCacheAbstractFailoverSelfTest extends GridCacheAbstrac cache.remove("key" + i); } catch (CacheException e) { - // It is ok to fail with topology exception. - if (!X.hasCause(e, ClusterTopologyCheckedException.class)) + if (!X.hasCause(e, ClusterTopologyCheckedException.class) && !(e instanceof CachePartialUpdateException)) throw e; } }