ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [7/7] ignite git commit: ignite-6667
Date Thu, 26 Oct 2017 08:29:02 GMT
ignite-6667


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

Branch: refs/heads/ignite-6667
Commit: ece4db124e9cb85cae44f5a95cd7432ada81836f
Parents: 1b4bf60
Author: sboikov <sboikov@gridgain.com>
Authored: Thu Oct 26 11:28:48 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Thu Oct 26 11:28:48 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/managers/discovery/GridDiscoveryManager.java   | 1 +
 .../internal/processors/cluster/ChangeGlobalStateMessage.java      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/ece4db12/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 5479f69..a6737dc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -3065,6 +3065,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi>
{
      *
      * @param topVer Topology version.
      * @param discoCache Current disco cache.
+     * @return New discovery cache.
      */
     public DiscoCache createDiscoCacheOnCacheChange(AffinityTopologyVersion topVer,
         DiscoCache discoCache) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/ece4db12/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java
index 22e376f..6a642bc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ChangeGlobalStateMessage.java
@@ -118,7 +118,7 @@ public class ChangeGlobalStateMessage implements DiscoveryCustomMessage
{
     /** {@inheritDoc} */
     @Override public DiscoCache createDiscoCache(GridDiscoveryManager mgr, AffinityTopologyVersion
topVer,
         DiscoCache discoCache) {
-        return discoCache.copy(topVer, null);
+        return mgr.createDiscoCacheOnCacheChange(topVer, discoCache);
     }
 
     /**


Mime
View raw message