ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [5/5] ignite git commit: Merge branch 'ignite-db-x' of https://github.com/gridgain/apache-ignite into ignite-db-x
Date Wed, 18 Jan 2017 18:14:01 GMT
Merge branch 'ignite-db-x' of https://github.com/gridgain/apache-ignite into ignite-db-x


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

Branch: refs/heads/ignite-3477
Commit: f6011a5cfcc79589601c9f612964acd332b2c673
Parents: b8d435b 8764930
Author: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Authored: Wed Jan 18 21:13:28 2017 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Wed Jan 18 21:13:28 2017 +0300

----------------------------------------------------------------------
 .../cluster/GridClusterStateProcessor.java           | 15 +++++++++------
 .../CacheExchangeMessageDuplicatedStateTest.java     |  8 ++++----
 .../dht/GridCacheDhtPreloadDisabledSelfTest.java     |  8 ++++----
 .../near/GridPartitionedBackupLoadSelfTest.java      |  4 ++--
 .../processors/igfs/IgfsProcessorSelfTest.java       |  2 +-
 5 files changed, 20 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f6011a5c/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
index f3952ed,8d16d14..87d54a1
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
@@@ -441,11 -441,12 +442,13 @@@ public class GridClusterStateProcessor 
              if (!client) {
                  sharedCtx.database().lock();
  
-                 if (sharedCtx.pageStore() != null)
-                     sharedCtx.pageStore().onActivate(ctx);
+                 IgnitePageStoreManager pageStore = sharedCtx.pageStore();
+ 
+                 if (pageStore != null)
+                     pageStore.onActivate(ctx);
  
 -                sharedCtx.wal().onActivate(ctx);
 +                if (sharedCtx.wal() != null)
 +                    sharedCtx.wal().onActivate(ctx);
  
                  sharedCtx.database().initDataBase();
  


Mime
View raw message