You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/05/12 13:30:55 UTC
[36/37] incubator-ignite git commit: #ignite-373: Remove unused
checks.
#ignite-373: Remove unused checks.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3782c7ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3782c7ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3782c7ca
Branch: refs/heads/ignite-373
Commit: 3782c7caad8e521f33e18eb4f0fabd4d40a6e086
Parents: 2cd3515
Author: ivasilinets <iv...@gridgain.com>
Authored: Tue May 12 14:27:46 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Tue May 12 14:27:46 2015 +0300
----------------------------------------------------------------------
.../cache/distributed/GridDistributedCacheAdapter.java | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3782c7ca/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
index bfa28e2..e5dbb94 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java
@@ -325,9 +325,6 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter
try {
if (!locPart.isEmpty() && locPart.primary(topVer)) {
for (GridDhtCacheEntry o : locPart.entries()) {
- if (!ctx.affinity().belongs(ctx.localNode(), part, topVer))
- return false;
-
if (!o.obsoleteOrDeleted())
dataLdr.removeDataInternal(o.key());
}
@@ -337,12 +334,8 @@ public abstract class GridDistributedCacheAdapter<K, V> extends GridCacheAdapter
ctx.swap().iterator(part);
if (iter != null) {
- for (Map.Entry<byte[], GridCacheSwapEntry> e : iter) {
- if (!ctx.affinity().belongs(ctx.localNode(), part, topVer))
- return false;
-
+ for (Map.Entry<byte[], GridCacheSwapEntry> e : iter)
dataLdr.removeDataInternal(ctx.toCacheKeyObject(e.getKey()));
- }
}
}
finally {