ignite-312 review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dee26ca5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dee26ca5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dee26ca5 Branch: refs/heads/ignite-312 Commit: dee26ca5777799c91a00af07d30b79b1e6adb3f4 Parents: c15d521 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Feb 24 17:55:31 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Feb 24 17:55:31 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/events/EventType.java | 8 +++++--- .../managers/discovery/GridDiscoveryManager.java | 19 +++++++++++++++---- 2 files changed, 20 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dee26ca5/modules/core/src/main/java/org/apache/ignite/events/EventType.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/events/EventType.java b/modules/core/src/main/java/org/apache/ignite/events/EventType.java index 4319d2a..add8050 100644 --- a/modules/core/src/main/java/org/apache/ignite/events/EventType.java +++ b/modules/core/src/main/java/org/apache/ignite/events/EventType.java @@ -153,14 +153,16 @@ public interface EventType { */ public static final int EVT_NODE_SEGMENTED = 14; - /** */ - public static final int EVT_DISCOVERY_CUSTOM_EVT = 15; - public static final int EVT_CLIENT_NODE_DISCONNECTED = 16; public static final int EVT_CLIENT_NODE_RECONNECTED = 17; /** + * + */ + public static final int EVT_DISCOVERY_CUSTOM_EVT = 18; + + /** * Built-in event type: task started. * <p> * NOTE: all types in range <b>from 1 to 1000 are reserved</b> for http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dee26ca5/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 81a5e07..03d289f 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 @@ -255,8 +255,13 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { } getSpi().setListener(new DiscoverySpiListener() { - @Override public void onDiscovery(int type, long topVer, ClusterNode node, Collection<ClusterNode> topSnapshot, - Map<Long, Collection<ClusterNode>> snapshots) { + @Override public void onDiscovery( + int type, + long topVer, + ClusterNode node, + Collection<ClusterNode> topSnapshot, + Map<Long, Collection<ClusterNode>> snapshots + ) { final ClusterNode locNode = localNode(); if (snapshots != null) @@ -1302,7 +1307,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { evt.eventNode(node); evt.type(type); - evt.topologySnapshot(topVer, U.<ClusterNode, ClusterNode>arrayList(topSnapshot, daemonFilter)); + evt.topologySnapshot(topVer, U.arrayList(topSnapshot, daemonFilter)); if (type == EVT_NODE_METRICS_UPDATED) evt.message("Metrics were updated: " + node); @@ -1332,7 +1337,13 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { * @param node Node. * @param topSnapshot Topology snapshot. */ - void addEvent(int type, long topVer, ClusterNode node, Collection<ClusterNode> topSnapshot, @Nullable Object data) { + void addEvent( + int type, + long topVer, + ClusterNode node, + Collection<ClusterNode> topSnapshot, + @Nullable Object data + ) { assert node != null; evts.add(F.t(type, topVer, node, topSnapshot, data));
