Merge remote-tracking branch 'apache/master' into ignite-884 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1a83d65a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1a83d65a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1a83d65a Branch: refs/heads/ignite-884 Commit: 1a83d65adab4f634ccd3a4e00d0d9334259b89f5 Parents: e34872d Author: Valentin Kulichenko <valentin.kuliche...@gmail.com> Authored: Wed Aug 26 17:10:33 2015 -0700 Committer: Valentin Kulichenko <valentin.kuliche...@gmail.com> Committed: Wed Aug 26 17:10:33 2015 -0700 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheProcessor.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1a83d65a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 02411b1..270eef4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -563,10 +563,13 @@ public class GridCacheProcessor extends GridProcessorAdapter { CacheConfiguration[] cfgs = ctx.config().getCacheConfiguration(); - Collection<CacheStoreSessionListener> sesLsnrs = CU.create(ctx, - ctx.config().getCacheStoreSessionListenerFactories()); + Collection<CacheStoreSessionListener> sesLsnrs = null; - CU.startStoreSessionListeners(ctx, sesLsnrs); + if (!ctx.config().isDaemon()) { + sesLsnrs = CU.create(ctx, ctx.config().getCacheStoreSessionListenerFactories()); + + CU.startStoreSessionListeners(ctx, sesLsnrs); + } sharedCtx = createSharedContext(ctx, sesLsnrs);