Repository: ignite Updated Branches: refs/heads/master ce2a98cdb -> e79125436
Minor. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/35d3d614 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/35d3d614 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/35d3d614 Branch: refs/heads/master Commit: 35d3d614779fb6c790c8ca87e612d6b4676ced35 Parents: bc8e645 Author: sboikov <sboi...@gridgain.com> Authored: Tue Sep 5 10:54:06 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Sep 5 10:54:06 2017 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtTxPrepareFuture.java | 1 - .../processors/cache/distributed/near/GridNearGetFuture.java | 2 +- .../processors/cache/local/atomic/GridLocalAtomicCache.java | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/35d3d614/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 03d99fc..ce3c290 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -1225,7 +1225,6 @@ public final class GridDhtTxPrepareFuture extends GridCacheCompoundFuture<Ignite } } - // We are holding transaction-level locks for entries here, so we can get next write version. onEntriesLocked(); // We are holding transaction-level locks for entries here, so we can get next write version. http://git-wip-us.apache.org/repos/asf/ignite/blob/35d3d614/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java index 9d9c682..1ab56a4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java @@ -584,7 +584,7 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap EntryGetResult res = dhtEntry.innerGetVersioned( null, null, - /**update-metrics*/false, + /*update-metrics*/false, /*event*/!nearRead && !skipVals, subjId, null, http://git-wip-us.apache.org/repos/asf/ignite/blob/35d3d614/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 4eacfb8..e99c9e8 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 @@ -1158,8 +1158,8 @@ public class GridLocalAtomicCache<K, V> extends GridLocalCache<K, V> { null, null, /*read-through*/ctx.loadPreviousValue(), - /**update-metrics*/true, - /**event*/true, + /*update-metrics*/true, + /*event*/true, subjId, null, taskName, @@ -1191,8 +1191,8 @@ public class GridLocalAtomicCache<K, V> extends GridLocalCache<K, V> { null, null, /*read-through*/ctx.loadPreviousValue(), - /**update-metrics*/true, - /**event*/true, + /*update-metrics*/true, + /*event*/true, subjId, null, taskName,
