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/02/02 11:28:42 UTC
[06/50] [abbrv] incubator-ignite git commit: fixed timers stop
fixed timers stop
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/38164d05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/38164d05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/38164d05
Branch: refs/heads/ignite-16
Commit: 38164d05670f920123078865bd6f0fec72020422
Parents: be6686d
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Wed Jan 28 19:00:11 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Wed Jan 28 19:00:11 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/GridKernal.java | 30 ++++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/38164d05/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java
index e13f48a..35484a8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java
@@ -1923,6 +1923,21 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMXB
}
}
+ // Cancel update notification timer.
+ if (updateNtfTimer != null)
+ updateNtfTimer.cancel();
+
+ if (starveTimer != null)
+ starveTimer.cancel();
+
+ // Cancel license timer.
+ if (licTimer != null)
+ licTimer.cancel();
+
+ // Cancel metrics log timer.
+ if (metricsLogTimer != null)
+ metricsLogTimer.cancel();
+
gw.writeLock();
try {
@@ -1931,21 +1946,6 @@ public class GridKernal extends ClusterGroupAdapter implements GridEx, IgniteMXB
// No more kernal calls from this point on.
gw.setState(STOPPING);
- // Cancel update notification timer.
- if (updateNtfTimer != null)
- updateNtfTimer.cancel();
-
- if (starveTimer != null)
- starveTimer.cancel();
-
- // Cancel license timer.
- if (licTimer != null)
- licTimer.cancel();
-
- // Cancel metrics log timer.
- if (metricsLogTimer != null)
- metricsLogTimer.cancel();
-
// Clear node local store.
nodeLoc.clear();