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 244A9180F2 for ; Mon, 18 May 2015 09:31:35 +0000 (UTC) Received: (qmail 87125 invoked by uid 500); 18 May 2015 09:31:35 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 87096 invoked by uid 500); 18 May 2015 09:31:35 -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 87087 invoked by uid 99); 18 May 2015 09:31:35 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 May 2015 09:31:35 +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 78EE11A2E5E for ; Mon, 18 May 2015 09:31:34 +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 1QJcSEJHtM_J for ; Mon, 18 May 2015 09:31:21 +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 274EB25F2B for ; Mon, 18 May 2015 09:31:13 +0000 (UTC) Received: (qmail 85566 invoked by uid 99); 18 May 2015 09:31:10 -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; Mon, 18 May 2015 09:31:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CD9D9E05E1; Mon, 18 May 2015 09:31:10 +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: Mon, 18 May 2015 09:31:37 -0000 Message-Id: In-Reply-To: <2ba11fe0be5e42f7aef2dd1f2f798ede@git.apache.org> References: <2ba11fe0be5e42f7aef2dd1f2f798ede@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [28/29] incubator-ignite git commit: # ignite-709_3 # ignite-709_3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/69fcdf55 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/69fcdf55 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/69fcdf55 Branch: refs/heads/ignite-709_2 Commit: 69fcdf55c008a85ee4ad1f3828a04bd0fc6c419b Parents: dc315c0 Author: sboikov Authored: Mon May 18 10:20:50 2015 +0300 Committer: sboikov Committed: Mon May 18 10:20:50 2015 +0300 ---------------------------------------------------------------------- .../cache/GridCacheVariableTopologySelfTest.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/69fcdf55/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java index ce0a55c..dc50ee6 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java @@ -19,8 +19,10 @@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; import org.apache.ignite.cache.*; +import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.cluster.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; @@ -137,8 +139,14 @@ public class GridCacheVariableTopologySelfTest extends GridCommonAbstractTest { tx.commit(); } - catch (TransactionOptimisticException e) { - info("Caught cache optimistic exception: " + e); + catch (ClusterTopologyException e) { + info("Caught topology exception: " + e); + } + catch (IgniteException e) { + if (X.hasCause(e, ClusterTopologyCheckedException.class)) + info("Caught cache exception: " + e); + else + throw e; } try {