Repository: incubator-ignite Updated Branches: refs/heads/ignite-683-1 acb6afc1f -> 23d713669
#ignite-683: Fix 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/23d71366 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/23d71366 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/23d71366 Branch: refs/heads/ignite-683-1 Commit: 23d71366904a8f744c991bec569aa09cec04a33e Parents: acb6afc Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Apr 7 09:27:30 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Apr 7 09:27:30 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtTransactionalCacheAdapter.java | 3 ++- .../cache/distributed/dht/colocated/GridDhtColocatedCache.java | 5 +---- .../cache/distributed/near/GridNearTransactionalCache.java | 3 ++- .../processors/cache/local/atomic/GridLocalAtomicCache.java | 3 +-- 4 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23d71366/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java index af6b42d..083dd9a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java @@ -610,7 +610,8 @@ public abstract class GridDhtTransactionalCacheAdapter<K, V> extends GridDhtCach timeout, tx, tx.threadId(), - accessTtl, null); + accessTtl, + CU.empty0()); for (KeyCacheObject key : keys) { try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23d71366/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java index c0edf02..073af66 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java @@ -370,7 +370,7 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte retval, timeout, accessTtl, - null); + CU.empty0()); // Future will be added to mvcc only if it was mapped to remote nodes. fut.map(); @@ -414,9 +414,6 @@ public class GridDhtColocatedCache<K, V> extends GridDhtTransactionalCacheAdapte GridDistributedCacheEntry entry = peekExx(cacheKey); - if (entry == null) - break; // While. - GridCacheMvccCandidate lock = ctx.mvcc().removeExplicitLock(Thread.currentThread().getId(), cacheKey, null); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23d71366/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java index 8297c05..7388977 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java @@ -421,7 +421,8 @@ public class GridNearTransactionalCache<K, V> extends GridNearCacheAdapter<K, V> isRead, retval, timeout, - accessTtl, null); + accessTtl, + CU.empty0()); if (!ctx.mvcc().addFuture(fut)) throw new IllegalStateException("Duplicate future ID: " + fut); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23d71366/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java index 985c27c..3874b9d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java @@ -137,8 +137,7 @@ public class GridLocalAtomicCache<K, V> extends GridCacheAdapter<K, V> { } /** {@inheritDoc} */ - @Override public boolean putx(K key, - V val) throws IgniteCheckedException { + @Override public boolean putx(K key, V val) throws IgniteCheckedException { return putx(key, val, null); }
