You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/10/25 14:01:26 UTC
[05/14] ignite git commit: IGNITE-6667 wip.
IGNITE-6667 wip.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c5d9df7c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c5d9df7c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c5d9df7c
Branch: refs/heads/ignite-6667
Commit: c5d9df7cec45ebd67458cdda0f917683a66e392e
Parents: 473bb44
Author: ascherbakoff <al...@gmail.com>
Authored: Sun Oct 22 15:18:22 2017 +0300
Committer: ascherbakoff <al...@gmail.com>
Committed: Sun Oct 22 15:18:22 2017 +0300
----------------------------------------------------------------------
.../internal/managers/discovery/GridDiscoveryManager.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c5d9df7c/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 0bf8cbe..fde8979 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
@@ -354,7 +354,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
*/
public void addCacheGroup(CacheGroupDescriptor grpDesc, IgnitePredicate<ClusterNode> filter, CacheMode cacheMode) {
CacheGroupAffinity old = registeredCacheGrps.put(grpDesc.groupId(),
- new CacheGroupAffinity(grpDesc.cacheOrGroupName(), filter, cacheMode));
+ new CacheGroupAffinity(grpDesc.cacheOrGroupName(), filter, cacheMode));
assert old == null : old;
}
@@ -1590,8 +1590,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
}
if (!locJoin.isDone())
- locJoin.onDone(
- new IgniteCheckedException("Failed to wait for local node joined event (grid is stopping)."));
+ locJoin.onDone(new IgniteCheckedException("Failed to wait for local node joined event (grid is stopping)."));
}
/** {@inheritDoc} */
@@ -2294,7 +2293,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> {
Collections.unmodifiableMap(cacheGrpAffNodes),
Collections.unmodifiableMap(nodeMap),
alives,
- null);
+ null);
}
/**