You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2014/03/28 21:30:07 UTC
git commit: [KARAF-2859] Use a dynamic import to allow the features
service to grab the region persistence even if the package has not been wired
Repository: karaf
Updated Branches:
refs/heads/master 200bd9ba0 -> 6aa49bcae
[KARAF-2859] Use a dynamic import to allow the features service to grab the region persistence even if the package has not been wired
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6aa49bca
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6aa49bca
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6aa49bca
Branch: refs/heads/master
Commit: 6aa49bcae3e9cbeee985cb4f7ffb722059269ff5
Parents: 200bd9b
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Fri Mar 28 20:34:00 2014 +0100
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Fri Mar 28 20:34:00 2014 +0100
----------------------------------------------------------------------
features/core/pom.xml | 3 +++
.../java/org/apache/karaf/features/internal/osgi/Activator.java | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/6aa49bca/features/core/pom.xml
----------------------------------------------------------------------
diff --git a/features/core/pom.xml b/features/core/pom.xml
index b7efe10..e2e3989 100644
--- a/features/core/pom.xml
+++ b/features/core/pom.xml
@@ -116,6 +116,9 @@
org.apache.karaf.region.persist;resolution:=optional,
*
</Import-Package>
+ <DynamicImport-Package>
+ org.apache.karaf.region.persist
+ </DynamicImport-Package>
<Private-Package>
org.apache.karaf.features.internal,
org.apache.karaf.features.internal.model,
http://git-wip-us.apache.org/repos/asf/karaf/blob/6aa49bca/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java b/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java
index 36e83ba..4e6129d 100644
--- a/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java
+++ b/features/core/src/main/java/org/apache/karaf/features/internal/osgi/Activator.java
@@ -222,8 +222,8 @@ public class Activator implements BundleActivator, SingleServiceTracker.SingleSe
doStop();
try {
doStart();
- } catch (Exception e) {
- LOGGER.warn("Error starting FeaturesService", e);
+ } catch (Throwable t) {
+ LOGGER.warn("Error starting FeaturesService", t);
doStop();
}
}