svn commit: r1779530 - /aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java

[tjwatson]

Author: tjwatson
Date: Thu Jan 19 21:52:17 2017
New Revision: 1779530

URL: http://svn.apache.org/viewvc?rev=1779530&view=rev
Log:
[ARIES-1666] Sharing policy is importing from requirements not included
as part of the subsystem

Change-Id: I67aad238c2ead853a447031767fa10c544b0d676
Signed-off-by: Thomas Watson <tjwat...@us.ibm.com>

Modified:
    
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java

Modified: 
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java?rev=1779530&r1=1779529&r2=1779530&view=diff
==============================================================================
--- 
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java
 (original)
+++ 
aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java
 Thu Jan 19 21:52:17 2017
@@ -639,6 +639,9 @@ public class SubsystemResource implement
                // Always provide visibility to this subsystem's service 
registration.
                addSubsystemServiceImportToSharingPolicy(builder, to);
                for (Resource resource : resolution.keySet()) {
+                       if (!contentHeader.contains(resource)) {
+                               continue;
+                       }
                        // If the resource is content but the wire provider is 
not,
                        // the sharing policy must be updated.
                        List<Wire> wires = resolution.get(resource);