ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [14/17] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
Date Tue, 26 Sep 2017 14:25:05 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java


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

Branch: refs/heads/ignite-3479
Commit: cc07f9f62e48d2142c22e50ca1952c96c1464683
Parents: 9f0572b
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Sep 26 12:42:53 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Sep 26 12:42:53 2017 +0300

----------------------------------------------------------------------
 .../cache/distributed/dht/GridPartitionedGetFuture.java          | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/cc07f9f6/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
index cd8b8c8..63156fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
@@ -155,6 +155,8 @@ public class GridPartitionedGetFuture<K, V> extends CacheDistributedGetFutureAda
                 return;
             }
 
+            final AffinityTopologyVersion topVer0 = topVer;
+
             IgniteInternalFuture<MvccCoordinatorVersion> cntrFut = cctx.shared().coordinators().requestQueryCounter(mvccCrd);
 
             cntrFut.listen(new IgniteInClosure<IgniteInternalFuture<MvccCoordinatorVersion>>()
{
@@ -164,7 +166,7 @@ public class GridPartitionedGetFuture<K, V> extends CacheDistributedGetFutureAda
 
                         map(keys,
                             Collections.<ClusterNode, LinkedHashMap<KeyCacheObject,
Boolean>>emptyMap(),
-                            GridPartitionedGetFuture.this.topVer);
+                            topVer0);
 
                         markInitialized();
                     }


Mime
View raw message