Repository: incubator-ignite Updated Branches: refs/heads/ignite-709_2 12aa8ab7f -> d59a712ad
IGNITE-709 Fix NPE Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d59a712a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d59a712a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d59a712a Branch: refs/heads/ignite-709_2 Commit: d59a712ad75c306ac43f37a9a77401f80821d3a5 Parents: 12aa8ab Author: sevdokimov <sevdoki...@gridgain.com> Authored: Tue May 26 13:43:12 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Tue May 26 13:43:12 2015 +0300 ---------------------------------------------------------------------- .../processors/continuous/GridContinuousProcessor.java | 11 +++++++++++ 1 file changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d59a712a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java index d67a45a..71a2a66 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java @@ -92,6 +92,9 @@ public class GridContinuousProcessor extends GridProcessorAdapter { /** Number of retries using to send messages. */ private int retryCnt = 3; + /** */ + private volatile boolean processorStopped; + /** * @param ctx Kernal context. */ @@ -257,6 +260,11 @@ public class GridContinuousProcessor extends GridProcessorAdapter { } /** {@inheritDoc} */ + @Override public void onKernalStop(boolean cancel) { + processorStopped = true; + } + + /** {@inheritDoc} */ @Override public void stop(boolean cancel) throws IgniteCheckedException { if (ctx.config().isDaemon()) return; @@ -551,6 +559,9 @@ public class GridContinuousProcessor extends GridProcessorAdapter { assert !nodeId.equals(ctx.localNodeId()); + if (processorStopped) + return; + RemoteRoutineInfo info = rmtInfos.get(routineId); if (info != null) {
