# IGNITE-187 Fixes after TC run.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eae78d22 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eae78d22 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eae78d22 Branch: refs/heads/sprint-2 Commit: eae78d227da0709ac4b9843bd08ab3c8a6afa738 Parents: 39754fe Author: AKuznetsov <akuznet...@gridgain.com> Authored: Sat Feb 28 10:06:57 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Sat Feb 28 10:06:57 2015 +0700 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/managers/GridManager.java | 3 --- .../internal/managers/checkpoint/GridCheckpointManager.java | 4 ++-- .../ignite/internal/managers/collision/GridCollisionManager.java | 4 ++-- .../ignite/internal/managers/indexing/GridIndexingManager.java | 4 ++-- .../ignite/internal/managers/swapspace/GridSwapSpaceManager.java | 4 ++-- 5 files changed, 8 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eae78d22/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java index 13536b1..236d83b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManager.java @@ -17,12 +17,9 @@ package org.apache.ignite.internal.managers; -import org.apache.ignite.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.util.tostring.*; -import java.util.*; - /** * This interface defines life-cycle for kernal manager. Managers provide layer of indirection * between kernal and SPI modules. Kernel never calls SPI modules directly but http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eae78d22/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java index f782546..e3776a2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/checkpoint/GridCheckpointManager.java @@ -75,11 +75,11 @@ public class GridCheckpointManager extends GridManagerAdapter<CheckpointSpi> { /** {@inheritDoc} */ @Override public void start() throws IgniteCheckedException { + super.start(); + if (ctx.config().isDaemon()) return; - super.start(); - for (CheckpointSpi spi : getSpis()) { spi.setCheckpointListener(new CheckpointListener() { @Override public void onCheckpointRemoved(String key) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eae78d22/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java index 37b5cfe..5ac0026 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java @@ -44,11 +44,11 @@ public class GridCollisionManager extends GridManagerAdapter<CollisionSpi> { /** {@inheritDoc} */ @Override public void start() throws IgniteCheckedException { + super.start(); + if (ctx.config().isDaemon()) return; - super.start(); - startSpi(); if (enabled()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eae78d22/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java index 9115f26..ebe72de 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java @@ -45,11 +45,11 @@ public class GridIndexingManager extends GridManagerAdapter<IndexingSpi> { * @throws IgniteCheckedException Thrown in case of any errors. */ @Override public void start() throws IgniteCheckedException { + super.start(); + if (ctx.config().isDaemon()) return; - super.start(); - if (!enabled()) U.warn(log, "Indexing is disabled (to enable please configure GridIndexingSpi)."); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eae78d22/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java index d1566ec..7cbb736 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/swapspace/GridSwapSpaceManager.java @@ -50,11 +50,11 @@ public class GridSwapSpaceManager extends GridManagerAdapter<SwapSpaceSpi> { /** {@inheritDoc} */ @Override public void start() throws IgniteCheckedException { + super.start(); + if (ctx.config().isDaemon()) return; - super.start(); - getSpi().setListener(new SwapSpaceSpiListener() { @Override public void onSwapEvent(int evtType, @Nullable String spaceName, @Nullable byte[] keyBytes) { if (ctx.event().isRecordable(evtType)) {
