You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/18 11:31:37 UTC
[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 <sb...@gridgain.com>
Authored: Mon May 18 10:20:50 2015 +0300
Committer: sboikov <sb...@gridgain.com>
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 {