ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [28/38] ignite git commit: Ignite-5075
Date Thu, 11 May 2017 10:19:13 GMT
Ignite-5075


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6705809e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6705809e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6705809e

Branch: refs/heads/ignite-5075
Commit: 6705809eb2c259a458a6b4c0875e00752d3f12c3
Parents: 1b88c1b
Author: Igor Seliverstov <gvvinblade@gmail.com>
Authored: Wed May 10 16:31:59 2017 +0300
Committer: Igor Seliverstov <gvvinblade@gmail.com>
Committed: Wed May 10 16:31:59 2017 +0300

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheProcessor.java    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/6705809e/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 8f15852..bf11e26 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
@@ -630,18 +630,17 @@ public class GridCacheProcessor extends GridProcessorAdapter {
         for (GridCacheSharedManager mgr : sharedCtx.managers())
             mgr.start(sharedCtx);
 
-        if (activeOnStart && !ctx.config().isDaemon()) {
-            Map<String, CacheJoinNodeDiscoveryData.CacheInfo> caches = new HashMap<>();
+        Map<String, CacheJoinNodeDiscoveryData.CacheInfo> caches = new HashMap<>();
 
-            Map<String, CacheJoinNodeDiscoveryData.CacheInfo> templates = new HashMap<>();
+        Map<String, CacheJoinNodeDiscoveryData.CacheInfo> templates = new HashMap<>();
 
+        if (activeOnStart && !ctx.config().isDaemon()) {
             registerCacheFromConfig(caches, templates);
-
             registerCacheFromPersistentStore(caches, templates);
-
-            cachesInfo.onStart(new CacheJoinNodeDiscoveryData(IgniteUuid.randomUuid(), caches,
templates));
         }
 
+        cachesInfo.onStart(new CacheJoinNodeDiscoveryData(IgniteUuid.randomUuid(), caches,
templates));
+
         if (log.isDebugEnabled())
             log.debug("Started cache processor.");
     }


Mime
View raw message