You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2017/03/23 14:18:29 UTC
[1/2] karaf git commit: [KARAF-5055] Use karaf shutdown timeout when
notifying the service wrapper in Main
Repository: karaf
Updated Branches:
refs/heads/master ac9bcf48d -> 64d2ef60a
[KARAF-5055] Use karaf shutdown timeout when notifying the service wrapper in Main
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e5f4f5c4
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e5f4f5c4
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e5f4f5c4
Branch: refs/heads/master
Commit: e5f4f5c4852b3b825bdfe411665c37721ba921fb
Parents: ac9bcf4
Author: jpoth <po...@gmail.com>
Authored: Wed Mar 22 13:43:08 2017 +0100
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Thu Mar 23 14:38:19 2017 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/karaf/main/Main.java | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/e5f4f5c4/main/src/main/java/org/apache/karaf/main/Main.java
----------------------------------------------------------------------
diff --git a/main/src/main/java/org/apache/karaf/main/Main.java b/main/src/main/java/org/apache/karaf/main/Main.java
index 685677e..ea82f31 100644
--- a/main/src/main/java/org/apache/karaf/main/Main.java
+++ b/main/src/main/java/org/apache/karaf/main/Main.java
@@ -638,11 +638,13 @@ public class Main {
return true;
}
try {
- int step = 5000;
-
- // Notify the callback asap
+ int timeout = config.shutdownTimeout;
+ if (config.shutdownTimeout <= 0) {
+ timeout = Integer.MAX_VALUE;
+ }
+
if (shutdownCallback != null) {
- shutdownCallback.waitingForShutdown(step);
+ shutdownCallback.waitingForShutdown(timeout);
}
exiting = true;
@@ -659,15 +661,9 @@ public class Main {
}.start();
}
- int timeout = config.shutdownTimeout;
- if (config.shutdownTimeout <= 0) {
- timeout = Integer.MAX_VALUE;
- }
+ int step = 5000;
while (timeout > 0) {
timeout -= step;
- if (shutdownCallback != null) {
- shutdownCallback.waitingForShutdown(step * 2);
- }
FrameworkEvent event = framework.waitForStop(step);
if (event.getType() != FrameworkEvent.WAIT_TIMEDOUT) {
if (activatorManager != null) {
[2/2] karaf git commit: [KARAF-5055] This closes #290
Posted by jb...@apache.org.
[KARAF-5055] This closes #290
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/64d2ef60
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/64d2ef60
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/64d2ef60
Branch: refs/heads/master
Commit: 64d2ef60adb718655dee10d9e0bdc1d0a2e94a5c
Parents: ac9bcf4 e5f4f5c
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Thu Mar 23 15:18:19 2017 +0100
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Thu Mar 23 15:18:19 2017 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/karaf/main/Main.java | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------