ignite-1537 merge from master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/76beadb5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/76beadb5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/76beadb5 Branch: refs/heads/ignite-1537 Commit: 76beadb51b40b6bf4edd55a5c98ea6b7a4d02a27 Parents: f0b3b60 Author: sboikov <sboi...@gridgain.com> Authored: Mon Oct 12 13:38:23 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Oct 12 13:41:42 2015 +0300 ---------------------------------------------------------------------- .../distributed/near/GridNearOptimisticTxPrepareFuture.java | 8 ++++---- .../org/apache/ignite/testsuites/IgniteCacheTestSuite4.java | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/76beadb5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java index 150f352..55d3817 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java @@ -72,7 +72,7 @@ import static org.apache.ignite.transactions.TransactionState.PREPARING; */ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAdapter implements GridCacheMvccFuture<IgniteInternalTx> { - + /** */ private KeyLockFuture keyLockFut = new KeyLockFuture(); /** @@ -446,14 +446,13 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd * @param writes Write entries. * @param remap Remap flag. * @param topLocked {@code True} if thread already acquired lock preventing topology change. - * @throws IgniteCheckedException If failed. */ private void prepare( Iterable<IgniteTxEntry> reads, Iterable<IgniteTxEntry> writes, boolean remap, boolean topLocked - ) throws IgniteCheckedException { + ) { AffinityTopologyVersion topVer = tx.topologyVersion(); assert topVer.topologyVersion() > 0; @@ -524,7 +523,8 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd keyLockFut.onAllKeysAdded(); - add(keyLockFut); + if (!remap) + add(keyLockFut); if (isDone()) { if (log.isDebugEnabled()) http://git-wip-us.apache.org/repos/asf/ignite/blob/76beadb5/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java index 644a245..b89bffd 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java @@ -80,7 +80,6 @@ import org.apache.ignite.internal.processors.cache.distributed.CacheAffinityEarl import org.apache.ignite.internal.processors.cache.distributed.CacheGetFutureHangsSelfTest; import org.apache.ignite.internal.processors.cache.distributed.CacheNoValueClassOnServerNodeTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheCreatePutMultiNodeSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheCreatePutMultiNodeSelfTest; import org.apache.ignite.internal.processors.cache.distributed.IgniteCacheCreatePutTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtTxPreloadSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCacheLockFailoverSelfTest;
