You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/09/14 16:32:58 UTC
[1/2] ignite git commit: IGNITE-1479 Platform .Net: NPE in
PlatformAbstractService upon service cancellation
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 <pt...@gridgain.com>
Authored: Mon Sep 14 17:23:16 2015 +0300
Committer: ptupitsyn <pt...@gridgain.com>
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} */
[2/2] ignite git commit: Minor docs improvement.
Posted by vo...@apache.org.
Minor docs improvement.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c01313d4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c01313d4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c01313d4
Branch: refs/heads/ignite-1.4
Commit: c01313d4609bb9a4209e2026b24b09df12935d75
Parents: a0cd9af
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Sep 14 17:33:37 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Sep 14 17:33:37 2015 +0300
----------------------------------------------------------------------
.../processors/platform/services/PlatformAbstractService.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c01313d4/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 dd5c28a..0b9ee53 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,9 +212,8 @@ public abstract class PlatformAbstractService implements PlatformService, Extern
@SuppressWarnings("UnusedDeclaration")
@IgniteInstanceResource
public void setIgniteInstance(Ignite ignite) {
- platformCtx = ignite != null
- ? PlatformUtils.platformContext(ignite)
- : null;
+ // Ignite instance can be null here because service processor invokes "cleanup" on resource manager.
+ platformCtx = ignite != null ? PlatformUtils.platformContext(ignite) : null;
}
/** {@inheritDoc} */