ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [35/37] incubator-ignite git commit: #ignite-373: Remove all do not use local topology version.
Date Tue, 12 May 2015 11:30:54 GMT
#ignite-373: Remove all do not use local topology version.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2cd3515f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2cd3515f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2cd3515f

Branch: refs/heads/ignite-373
Commit: 2cd3515fa87c899de34a820ec2acc214f4c052ae
Parents: be74517
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Tue May 12 14:22:47 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Tue May 12 14:22:47 2015 +0300

----------------------------------------------------------------------
 .../cache/distributed/GridDistributedCacheAdapter.java       | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2cd3515f/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 5f8b989..bfa28e2 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,8 +325,7 @@ 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(), locPart.id(),
-                                            dht.topology().topologyVersion()))
+                                        if (!ctx.affinity().belongs(ctx.localNode(), part,
topVer))
                                             return false;
 
                                         if (!o.obsoleteOrDeleted())
@@ -335,12 +334,11 @@ public abstract class GridDistributedCacheAdapter<K, V> extends
GridCacheAdapter
                                 }
 
                                 GridCloseableIterator<Map.Entry<byte[], GridCacheSwapEntry>>
iter =
-                                    ctx.swap().iterator(locPart.id());
+                                    ctx.swap().iterator(part);
 
                                 if (iter != null) {
                                     for (Map.Entry<byte[], GridCacheSwapEntry> e :
iter) {
-                                        if (!ctx.affinity().belongs(ctx.localNode(), locPart.id(),
-                                            dht.topology().topologyVersion()))
+                                        if (!ctx.affinity().belongs(ctx.localNode(), part,
topVer))
                                             return false;
 
                                         dataLdr.removeDataInternal(ctx.toCacheKeyObject(e.getKey()));


Mime
View raw message