You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by tj...@apache.org on 2017/01/19 22:10:29 UTC
svn commit: r1779540 - in /aries/branches/java6support/subsystem: ./
subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResolveContext.java
subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java
Author: tjwatson
Date: Thu Jan 19 22:10:29 2017
New Revision: 1779540
URL: http://svn.apache.org/viewvc?rev=1779540&view=rev
Log:
Mergin ^/aries/trunk/subsystem r1777366 through r1779539 into java6support branch
Modified:
aries/branches/java6support/subsystem/ (props changed)
aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResolveContext.java
aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java
Propchange: aries/branches/java6support/subsystem/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 19 22:10:29 2017
@@ -1,2 +1,2 @@
/aries/branches/1.0-prototype/subsystem:1306564-1337594
-/aries/trunk/subsystem:1728111-1777365
+/aries/trunk/subsystem:1728111-1779539
Modified: aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResolveContext.java
URL: http://svn.apache.org/viewvc/aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResolveContext.java?rev=1779540&r1=1779539&r2=1779540&view=diff
==============================================================================
--- aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResolveContext.java (original)
+++ aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResolveContext.java Thu Jan 19 22:10:29 2017
@@ -130,8 +130,9 @@ public class ResolveContext extends org.
}
private void processWire(Wire wire, Requirement requirement, List<Capability> capabilities) {
- Capability capability = wire.getCapability();
- processCapability(capability, requirement, capabilities);
+ if (requirement.equals(wire.getRequirement())) {
+ capabilities.add(wire.getCapability());
+ }
}
private void processCapability(Capability capability, Requirement requirement, List<Capability> capabilities) {
Modified: aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java
URL: http://svn.apache.org/viewvc/aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java?rev=1779540&r1=1779539&r2=1779540&view=diff
==============================================================================
--- aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java (original)
+++ aries/branches/java6support/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java Thu Jan 19 22:10:29 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);