karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf git commit: [KARAF-3564] Create the shutdown command/port before the lock
Date Mon, 30 Mar 2015 19:47:56 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-2.x 99e1800f8 -> 5fdcc4290


[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/5fdcc429
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5fdcc429
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5fdcc429

Branch: refs/heads/karaf-2.x
Commit: 5fdcc4290555cb1f532d2c9a3c4c2c6c9321fe73
Parents: 99e1800
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Mon Mar 30 21:47:32 2015 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Mon Mar 30 21:47:32 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/5fdcc429/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 9a12861..803c499 100644
--- a/main/src/main/java/org/apache/karaf/main/Main.java
+++ b/main/src/main/java/org/apache/karaf/main/Main.java
@@ -1454,11 +1454,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, 0);
                 for (;;) {
                     if (!dataDir.isDirectory()) {


Mime
View raw message