You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2016/06/22 06:12:28 UTC
ignite git commit: IGNITE-3339 - Code review.
Repository: ignite
Updated Branches:
refs/heads/ignite-3339 b029bb89e -> 32966bbcf
IGNITE-3339 - Code review.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/32966bbc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/32966bbc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/32966bbc
Branch: refs/heads/ignite-3339
Commit: 32966bbcf173d039ee39efe6d3e1a8a32ee00060
Parents: b029bb8
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Tue Jun 21 23:12:20 2016 -0700
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Tue Jun 21 23:12:20 2016 -0700
----------------------------------------------------------------------
.../cache/distributed/near/GridNearGetFuture.java | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/32966bbc/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 a56602e..6c4aeef 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
@@ -640,16 +640,10 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap
return false;
}
finally {
- if (dhtEntry != null) {
- if (!isNearEnabled(dht.context().config())) {
- if (tx == null || (!tx.implicit() && tx.isolation() == READ_COMMITTED))
- dht.context().evicts().touch(dhtEntry, topVer);
- }
+ if (dhtEntry != null)
// Near cache is enabled, so near entry will be enlisted in the transaction.
// Always touch DHT entry in this case.
- else
- dht.context().evicts().touch(dhtEntry, topVer);
- }
+ dht.context().evicts().touch(dhtEntry, topVer);
}
}
}