You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/03/31 17:06:05 UTC
[11/11] ignite git commit: IGNITE-3477 - Fixing formatting
IGNITE-3477 - Fixing formatting
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/15e2024b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/15e2024b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/15e2024b
Branch: refs/heads/ignite-3477-master
Commit: 15e2024b838533cb1d6e3bd4cdc0e0f21f402896
Parents: 424504d
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri Mar 31 20:05:53 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri Mar 31 20:05:53 2017 +0300
----------------------------------------------------------------------
.../processors/service/GridServiceProcessor.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/15e2024b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
index 26c3066..0454da4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProcessor.java
@@ -275,16 +275,16 @@ public class GridServiceProcessor extends GridProcessorAdapter implements Ignite
/** {@inheritDoc} */
@Override public void onKernalStop(boolean cancel) {
+ if (ctx.isDaemon())
+ return;
+
busyLock.block();
try {
- if (ctx.isDaemon())
- return;
+ U.shutdownNow(GridServiceProcessor.class, depExe, log);
- U.shutdownNow(GridServiceProcessor.class, depExe, log);
-
- if (!ctx.clientNode())
- ctx.event().removeDiscoveryEventListener(topLsnr);
+ if (!ctx.clientNode())
+ ctx.event().removeDiscoveryEventListener(topLsnr);
Collection<ServiceContextImpl> ctxs = new ArrayList<>();