Repository: karaf Updated Branches: refs/heads/master fbb840a9a -> 09d4d1e68
[KARAF-5072] Avoid InterruptedException in case we do not have to wait for started Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/09d4d1e6 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/09d4d1e6 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/09d4d1e6 Branch: refs/heads/master Commit: 09d4d1e680524ce6f7dd672287f6aa87c2b60928 Parents: fbb840a Author: Christian Schneider <[email protected]> Authored: Mon Jul 31 15:47:39 2017 +0200 Committer: Christian Schneider <[email protected]> Committed: Mon Jul 31 15:47:39 2017 +0200 ---------------------------------------------------------------------- .../apache/karaf/shell/impl/action/osgi/CommandExtension.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/09d4d1e6/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/CommandExtension.java ---------------------------------------------------------------------- diff --git a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/CommandExtension.java b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/CommandExtension.java index 167b4e2..7c8e77e 100644 --- a/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/CommandExtension.java +++ b/shell/core/src/main/java/org/apache/karaf/shell/impl/action/osgi/CommandExtension.java @@ -119,9 +119,12 @@ public class CommandExtension implements Extension { public void destroy() { try { - started.await(5000, TimeUnit.MILLISECONDS); + if (started.getCount() > 0) { + // Check to avoid InterruptedException in case we do not have to wait at all + started.await(5000, TimeUnit.MILLISECONDS); + } } catch (InterruptedException e) { - LOGGER.warn("The wait for bundle being started before destruction has been interrupted.", e); + LOGGER.warn("The wait for bundle " + bundle.getSymbolicName() + " being started before destruction has been interrupted.", e); } tracker.close(); }
