ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/2] ignite git commit: ignite-5578
Date Tue, 01 Aug 2017 12:57:21 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-5578 81389d19e -> 2ae3abd7d


ignite-5578


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

Branch: refs/heads/ignite-5578
Commit: d8ecb995bf45d0add8b3f191e2d191ee29bec878
Parents: 81389d1
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Aug 1 13:39:05 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Aug 1 13:39:05 2017 +0300

----------------------------------------------------------------------
 .../dht/preloader/GridDhtPartitionsExchangeFuture.java           | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d8ecb995/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index eff407f36..d04974a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -1570,6 +1570,10 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
         return wait;
     }
 
+    /**
+     * @param fut Current future.
+     * @return Pending join request if any.
+     */
     @Nullable public GridDhtPartitionsSingleMessage mergeJoinExchangeOnDone(GridDhtPartitionsExchangeFuture
fut) {
         synchronized (this) {
             assert !isDone();


Mime
View raw message