Repository: ignite Updated Branches: refs/heads/ignite-1537 97f1d83e9 -> b7202b2be
ignite-1.5 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b7202b2b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b7202b2b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b7202b2b Branch: refs/heads/ignite-1537 Commit: b7202b2be78b69864002d633e9276503d3fb90f9 Parents: 97f1d83 Author: sboikov <sboi...@gridgain.com> Authored: Mon Jan 11 11:08:32 2016 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Jan 11 11:10:52 2016 +0300 ---------------------------------------------------------------------- .../processors/cache/distributed/near/GridNearTxFinishFuture.java | 3 --- .../ignite/internal/processors/cache/GridCacheStopSelfTest.java | 2 +- .../datastructures/IgniteClientDataStructuresAbstractTest.java | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b7202b2b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java index 20582e9..1b40d6e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java @@ -231,9 +231,6 @@ public final class GridNearTxFinishFuture<K, V> extends GridCompoundIdentityFutu boolean marked = tx.setRollbackOnly(); - if (err instanceof NodeStoppingException) - return super.onDone(null, err); - if (err instanceof IgniteTxRollbackCheckedException) { if (marked) { try { http://git-wip-us.apache.org/repos/asf/ignite/blob/b7202b2b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java index a34857f..e70c97b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStopSelfTest.java @@ -299,7 +299,7 @@ public class GridCacheStopSelfTest extends GridCommonAbstractTest { return null; } - })); + }, "cache-thread")); } readyLatch.await(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b7202b2b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java index bf6dcda..34e7080 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java @@ -30,6 +30,7 @@ import org.apache.ignite.configuration.CollectionConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -59,6 +60,8 @@ public abstract class IgniteClientDataStructuresAbstractTest extends GridCommonA ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); + ((TcpCommunicationSpi)cfg.getCommunicationSpi()).setSharedMemoryPort(-1); + return cfg; }
