You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/01/18 13:44:03 UTC
[46/50] [abbrv] ignite git commit: fix NPE
fix NPE
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9134452f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9134452f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9134452f
Branch: refs/heads/ignite-gg-11810-2
Commit: 9134452f5efe043570ceefe4641d17b2ee6a73bb
Parents: 8f005c3
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jan 18 11:37:48 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jan 18 11:37:48 2017 +0300
----------------------------------------------------------------------
.../processors/cluster/GridClusterStateProcessor.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9134452f/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java
----------------------------------------------------------------------
diff --git 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
index fa6910d..f3952ed 100644
--- 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
@@ -391,7 +391,8 @@ public class GridClusterStateProcessor extends GridProcessorAdapter {
if (sharedCtx.pageStore() != null)
sharedCtx.pageStore().onDeActivate(ctx);
- sharedCtx.wal().onDeActivate(ctx);
+ if (sharedCtx.wal() != null)
+ sharedCtx.wal().onDeActivate(ctx);
}
}
catch (Exception e) {
@@ -443,7 +444,8 @@ public class GridClusterStateProcessor extends GridProcessorAdapter {
if (sharedCtx.pageStore() != null)
sharedCtx.pageStore().onActivate(ctx);
- sharedCtx.wal().onActivate(ctx);
+ if (sharedCtx.wal() != null)
+ sharedCtx.wal().onActivate(ctx);
sharedCtx.database().initDataBase();
@@ -576,7 +578,8 @@ public class GridClusterStateProcessor extends GridProcessorAdapter {
if (sharedCtx.pageStore() != null)
sharedCtx.pageStore().onDeActivate(ctx);
- sharedCtx.wal().onDeActivate(ctx);
+ if (sharedCtx.wal() != null)
+ sharedCtx.wal().onDeActivate(ctx);
sharedCtx.affinity().removeAllCacheInfo();
}