karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject [karaf] branch master updated: [KARAF-5446] Fragment bundles are not resolved properly when installing/restarting the container
Date Mon, 20 Nov 2017 09:06:08 GMT
This is an automated email from the ASF dual-hosted git repository.

gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 46e8b90  [KARAF-5446] Fragment bundles are not resolved properly when installing/restarting
the container
46e8b90 is described below

commit 46e8b90ef3d37996f72f606bc8843c37540817eb
Author: Guillaume Nodet <gnodet@gmail.com>
AuthorDate: Mon Nov 20 10:05:21 2017 +0100

    [KARAF-5446] Fragment bundles are not resolved properly when installing/restarting the
container
---
 .../org/apache/karaf/features/extension/StoredWiringResolver.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/features/extension/src/main/java/org/apache/karaf/features/extension/StoredWiringResolver.java
b/features/extension/src/main/java/org/apache/karaf/features/extension/StoredWiringResolver.java
index 0d7de17..06b8bc6 100644
--- a/features/extension/src/main/java/org/apache/karaf/features/extension/StoredWiringResolver.java
+++ b/features/extension/src/main/java/org/apache/karaf/features/extension/StoredWiringResolver.java
@@ -27,6 +27,7 @@ import java.util.Map;
 
 import org.osgi.framework.Bundle;
 import org.osgi.framework.hooks.resolver.ResolverHook;
+import org.osgi.framework.namespace.ExecutionEnvironmentNamespace;
 import org.osgi.framework.namespace.HostNamespace;
 import org.osgi.framework.namespace.IdentityNamespace;
 import org.osgi.framework.wiring.BundleCapability;
@@ -85,7 +86,8 @@ class StoredWiringResolver implements ResolverHook {
     private long getBundleId(BundleRequirement requirement) {
         long sourceId = requirement.getRevision().getBundle().getBundleId();
         if (isFragment(requirement.getRevision())
-            && !requirement.getNamespace().equals(HostNamespace.HOST_NAMESPACE))
{
+            && !requirement.getNamespace().equals(HostNamespace.HOST_NAMESPACE)
+            && !requirement.getNamespace().equals(ExecutionEnvironmentNamespace.EXECUTION_ENVIRONMENT_NAMESPACE))
{
             sourceId = wiring.get(sourceId).getFragmentHost();
         }
         return sourceId;

-- 
To stop receiving notification emails like this one, please contact
['"commits@karaf.apache.org" <commits@karaf.apache.org>'].

Mime
View raw message