# ignite-838
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dbd8d64a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dbd8d64a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dbd8d64a Branch: refs/heads/ignite-157-2 Commit: dbd8d64ab256ba1a5f4104fe3eef8d5ba24bc2e6 Parents: ef9b2d9 Author: sboikov <semen.boi...@inria.fr> Authored: Wed Apr 29 20:27:29 2015 +0300 Committer: sboikov <semen.boi...@inria.fr> Committed: Wed Apr 29 20:28:31 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dbd8d64a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java index b43f8a5..871512c 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/IgniteSpiAdapter.java @@ -67,7 +67,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement private String name; /** Grid SPI context. */ - private volatile IgniteSpiContext spiCtx = new GridDummySpiContext(null, false); + private volatile IgniteSpiContext spiCtx = new GridDummySpiContext(null, false, null); /** Discovery listener. */ private GridLocalEventListener paramsLsnr; @@ -190,7 +190,7 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement ClusterNode locNode = spiCtx == null ? null : spiCtx.localNode(); // Set dummy no-op context. - spiCtx = new GridDummySpiContext(locNode, true); + spiCtx = new GridDummySpiContext(locNode, true, spiCtx); } /** @@ -551,15 +551,24 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement /** */ private final boolean stopping; + /** */ + private final MessageFactory msgFactory; + + /** */ + private final MessageFormatter msgFormatter; + /** * Create temp SPI context. * * @param locNode Local node. * @param stopping Node stopping flag. + * @param spiCtx SPI context. */ - GridDummySpiContext(ClusterNode locNode, boolean stopping) { + GridDummySpiContext(ClusterNode locNode, boolean stopping, @Nullable IgniteSpiContext spiCtx) { this.locNode = locNode; this.stopping = stopping; + this.msgFactory = spiCtx != null ? spiCtx.messageFactory() : null; + this.msgFormatter = spiCtx != null ? spiCtx.messageFormatter() : null; } /** {@inheritDoc} */ @@ -711,12 +720,12 @@ public abstract class IgniteSpiAdapter implements IgniteSpi, IgniteSpiManagement /** {@inheritDoc} */ @Override public MessageFormatter messageFormatter() { - return null; + return msgFormatter; } /** {@inheritDoc} */ @Override public MessageFactory messageFactory() { - return null; + return msgFactory; } /** {@inheritDoc} */
