diff options
| author | Thomas Watson | 2020-02-12 22:29:23 +0000 |
|---|---|---|
| committer | Thomas Watson | 2020-02-12 22:29:23 +0000 |
| commit | 854a5af441c11a2ba91cad2d45915f114a126fdd (patch) | |
| tree | f2a231581c4aea361901ce92bbc89d21273ffbba /bundles/org.eclipse.osgi/container | |
| parent | 5beb53f68349d191433725fc28426cc83af1cff0 (diff) | |
| download | rt.equinox.framework-854a5af441c11a2ba91cad2d45915f114a126fdd.tar.gz rt.equinox.framework-854a5af441c11a2ba91cad2d45915f114a126fdd.tar.xz rt.equinox.framework-854a5af441c11a2ba91cad2d45915f114a126fdd.zip | |
Bug 560070 - [resolver] resolving in batch can override substitedI20200214-0620I20200213-1800I20200213-1520I20200213-1210I20200213-1100I20200213-0640
packages
Change-Id: Ieb07bfa4d7ba17cc22859f1ed4f12889e23efbfe
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.osgi/container')
| -rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java index cf8318a79..a9464d429 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java @@ -481,7 +481,8 @@ final class ModuleResolver { addRequiredWires(requiredWires, existingRequiredWires, existingRequirements); InternalUtils.filterCapabilityPermissions(existingCapabilities); - return new ModuleWiring(revision, existingCapabilities, existingRequirements, existingProvidedWires, existingRequiredWires, Collections.EMPTY_LIST); + return new ModuleWiring(revision, existingCapabilities, existingRequirements, existingProvidedWires, + existingRequiredWires, existingWiring.getSubstitutedNames()); } static boolean isSingleton(ModuleRevision revision) { |