Repository: karaf Updated Branches: refs/heads/karaf-2.3.x 46b12f465 -> 270a72bf0
[KARAF-3564] Create the shutdown command/port before the lock Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/270a72bf Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/270a72bf Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/270a72bf Branch: refs/heads/karaf-2.3.x Commit: 270a72bf05cb55d498200fd95f3d997ea6a3ec65 Parents: 46b12f4 Author: Jean-Baptiste Onofré <[email protected]> Authored: Mon Mar 30 21:38:28 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Mon Mar 30 21:38:28 2015 +0200 ---------------------------------------------------------------------- main/src/main/java/org/apache/karaf/main/Main.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/270a72bf/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 e55c736..2e15e22 100644 --- a/main/src/main/java/org/apache/karaf/main/Main.java +++ b/main/src/main/java/org/apache/karaf/main/Main.java @@ -1408,11 +1408,11 @@ public class Main { lock = (Lock) Class.forName(clz).getConstructor(Properties.class).newInstance(props); boolean lockLogged = false; while (!exiting) { + setupShutdown(props); if (lock.lock()) { if (lockLogged) { LOG.info("Lock acquired."); } - setupShutdown(props); setStartLevel(defaultStartLevel); for (;;) { if (!dataDir.isDirectory()) {
