ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [22/50] [abbrv] ignite git commit: ignite-gg-11650 Stabilize 8.0.2.ea1 branch after merging activation/deactivation fix join inactive node to active cluster (minor update)
Date Thu, 29 Dec 2016 09:37:26 GMT
ignite-gg-11650 Stabilize 8.0.2.ea1 branch after merging activation/deactivation fix join inactive
node to active cluster (minor update)


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

Branch: refs/heads/ignite-3477
Commit: 691c3b771b761fe0e82bf7877a3afc7add59196b
Parents: 094a1b8
Author: Dmitriy Govorukhin <dgovorukhin@gridgain.com>
Authored: Thu Dec 22 16:15:02 2016 +0300
Committer: Dmitriy Govorukhin <dgovorukhin@gridgain.com>
Committed: Thu Dec 22 16:15:02 2016 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheProcessor.java  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/691c3b77/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 6514287..f7a816e 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
@@ -759,6 +759,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
 
                 CacheConfiguration[] newCacheCfg = new CacheConfiguration[cacheCfgs.length];
 
+                boolean apply = false;
+
                 for (int i = 0; i < cacheCfgs.length; i++) {
                     CacheConfiguration conf = cacheCfgs[i];
 
@@ -771,12 +773,15 @@ public class GridCacheProcessor extends GridProcessorAdapter {
 
                             newCacheCfg[i] = c;
 
+                            apply = true;
+
                             break;
                         }
                     }
                 }
 
-                ctx.config().setCacheConfiguration(newCacheCfg);
+                if (apply)
+                    ctx.config().setCacheConfiguration(newCacheCfg);
 
                 activeOnStart = ctx.state().active();
             }


Mime
View raw message