Repository: karaf Updated Branches: refs/heads/karaf-2.x b12ea914b -> f5f3e0229
KARAF-4094: Multiple ports opened by slave when using file lock Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/f5f3e022 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/f5f3e022 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/f5f3e022 Branch: refs/heads/karaf-2.x Commit: f5f3e022946e61fd3fdc124915af7c4304803650 Parents: b12ea91 Author: Gert Vanthienen <[email protected]> Authored: Thu Nov 5 13:11:45 2015 +0100 Committer: Gert Vanthienen <[email protected]> Committed: Thu Nov 5 13:11:45 2015 +0100 ---------------------------------------------------------------------- main/src/main/java/org/apache/karaf/main/Main.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/f5f3e022/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 90cff3c..bb4af26 100644 --- a/main/src/main/java/org/apache/karaf/main/Main.java +++ b/main/src/main/java/org/apache/karaf/main/Main.java @@ -1479,8 +1479,13 @@ public class Main { String clz = props.getProperty(PROPERTY_LOCK_CLASS, PROPERTY_LOCK_CLASS_DEFAULT); lock = (Lock) Class.forName(clz).getConstructor(Properties.class).newInstance(props); boolean lockLogged = false; + boolean setupShutdownCompleted = false; while (!exiting) { - setupShutdown(props); + // only perform the shutdown setup once + if (!setupShutdownCompleted) { + setupShutdown(props); + setupShutdownCompleted = true; + } if (lock.lock()) { if (lockLogged) { LOG.info("Lock acquired.");
