You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2017/07/31 13:48:10 UTC
karaf git commit: [KARAF-5072] Avoid InterruptedException in case we
do not have to wait for started
Repository: karaf
Updated Branches:
refs/heads/karaf-4.1.x 5116ae91d -> 90d3fa164
[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/90d3fa16
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/90d3fa16
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/90d3fa16
Branch: refs/heads/karaf-4.1.x
Commit: 90d3fa1641eea375220614886d2a0df494ae6d9a
Parents: 5116ae9
Author: Christian Schneider <ch...@die-schneider.net>
Authored: Mon Jul 31 15:47:39 2017 +0200
Committer: Christian Schneider <ch...@die-schneider.net>
Committed: Mon Jul 31 15:48:03 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/90d3fa16/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 33d17ca..53b6381 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();
}