ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject incubator-ignite git commit: #IGNITE-80 Debug
Date Tue, 14 Apr 2015 23:57:19 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-80 f5910027c -> e4867e4bd


#IGNITE-80 Debug


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

Branch: refs/heads/ignite-80
Commit: e4867e4bd0957414fed6a55a8a37b18226b2beb3
Parents: f591002
Author: Alexey Goncharuk <agoncharuk@gridgain.com>
Authored: Tue Apr 14 16:57:14 2015 -0700
Committer: Alexey Goncharuk <agoncharuk@gridgain.com>
Committed: Tue Apr 14 16:57:14 2015 -0700

----------------------------------------------------------------------
 .../processors/cache/distributed/dht/GridDhtCacheAdapter.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e4867e4b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index a875a26..c182d43 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -663,8 +663,10 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap
                     res.error(e);
                 }
 
-                res.invalidPartitions(fut.invalidPartitions(),
-                    new AffinityTopologyVersion(ctx.discovery().topologyVersion()));
+                if (!F.isEmpty(fut.invalidPartitions()))
+                    res.invalidPartitions(fut.invalidPartitions(), ctx.shared().exchange().readyAffinityVersion());
+                else
+                    res.invalidPartitions(fut.invalidPartitions(), req.topologyVersion());
 
                 try {
                     ctx.io().send(nodeId, res, ctx.ioPolicy());


Mime
View raw message