# IGNITE-187 Fixes for spi start.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25b1e5a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25b1e5a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25b1e5a2 Branch: refs/heads/sprint-2 Commit: 25b1e5a23e0bc81d3abf92110af1a1a1418ac9e4 Parents: 57fc321 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Wed Mar 4 14:23:22 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Wed Mar 4 14:23:22 2015 +0700 ---------------------------------------------------------------------- .../org/apache/ignite/internal/managers/GridManagerAdapter.java | 5 +++++ .../internal/managers/discovery/GridDiscoveryManager.java | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25b1e5a2/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java index f963f9b..7c692e3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java @@ -33,6 +33,7 @@ import org.apache.ignite.lang.*; import org.apache.ignite.plugin.extensions.communication.*; import org.apache.ignite.plugin.security.*; import org.apache.ignite.spi.*; +import org.apache.ignite.spi.discovery.*; import org.apache.ignite.spi.swapspace.*; import org.jetbrains.annotations.*; @@ -42,6 +43,7 @@ import java.util.*; import static java.util.Arrays.*; import static java.util.concurrent.TimeUnit.*; +import static org.apache.ignite.internal.IgniteVersionUtils.*; import static org.apache.ignite.internal.managers.communication.GridIoPolicy.*; /** @@ -207,6 +209,9 @@ public abstract class GridManagerAdapter<T extends IgniteSpi> implements GridMan if (log.isDebugEnabled()) log.debug("Starting SPI implementation: " + spi.getClass().getName()); + if (spi instanceof DiscoverySpi) + ((DiscoverySpi)spi).setNodeAttributes(ctx.nodeAttributes(), VER); + try { spi.spiStart(ctx.gridName()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25b1e5a2/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 44150e4..bfa4fae 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 @@ -205,8 +205,6 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { DiscoverySpi spi = getSpi(); - spi.setNodeAttributes(ctx.nodeAttributes(), VER); - discoOrdered = discoOrdered(); histSupported = historySupported();
