Repository: ignite Updated Branches: refs/heads/ignite-1.4 b4c515e62 -> c01313d46
IGNITE-1479 Platform .Net: NPE in PlatformAbstractService upon service cancellation Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a0cd9afd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a0cd9afd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a0cd9afd Branch: refs/heads/ignite-1.4 Commit: a0cd9afd1cbf471ced0363416f4577156a7296ea Parents: b4c515e Author: ptupitsyn <[email protected]> Authored: Mon Sep 14 17:23:16 2015 +0300 Committer: ptupitsyn <[email protected]> Committed: Mon Sep 14 17:23:16 2015 +0300 ---------------------------------------------------------------------- .../processors/platform/services/PlatformAbstractService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a0cd9afd/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java index dac3ea2..dd5c28a 100644 --- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java +++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/services/PlatformAbstractService.java @@ -212,7 +212,9 @@ public abstract class PlatformAbstractService implements PlatformService, Extern @SuppressWarnings("UnusedDeclaration") @IgniteInstanceResource public void setIgniteInstance(Ignite ignite) { - platformCtx = PlatformUtils.platformContext(ignite); + platformCtx = ignite != null + ? PlatformUtils.platformContext(ignite) + : null; } /** {@inheritDoc} */
