Repository: incubator-ignite Updated Branches: refs/heads/ignite-45 19cf04431 -> a57ada587
IGNITE-45 - Fixed NPE when node stops on error. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a6e063b6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a6e063b6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a6e063b6 Branch: refs/heads/ignite-45 Commit: a6e063b6c21d82e58b7be96f5af004782797b30c Parents: 4b84c2f Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Sat Mar 21 22:36:28 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Sat Mar 21 22:36:28 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/internal/IgniteKernal.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6e063b6/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 48c3001..41cceac 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -1752,7 +1752,10 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { Thread.currentThread().interrupt(); try { - ctx.cache().blockGateways(); + GridCacheProcessor cache = ctx.cache(); + + if (cache != null) + cache.blockGateways(); assert gw.getState() == STARTED || gw.getState() == STARTING;
