Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2012-01-09 16:41:43 -0500
committerThomas Watson2012-01-09 16:58:10 -0500
commit1d44655e23034efd02c0d9a80202742d9b7b0dbc (patch)
treea83ffe64a37754986953e0c52b1fab87b518f34c
parent1130fbf1b75fa324ea98d8278458e63df64953eb (diff)
downloadrt.equinox.framework-1d44655e23034efd02c0d9a80202742d9b7b0dbc.tar.gz
rt.equinox.framework-1d44655e23034efd02c0d9a80202742d9b7b0dbc.tar.xz
rt.equinox.framework-1d44655e23034efd02c0d9a80202742d9b7b0dbc.zip
Bug 365677 - WeavingHook causes failure due to missing packagesv20120109-2158
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java
index 795f3a2b1..4bc76587d 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/ExportPackageDescriptionImpl.java
@@ -99,8 +99,12 @@ public class ExportPackageDescriptionImpl extends BaseDescriptionImpl implements
if (bundleVersion != null)
result.put(Constants.BUNDLE_VERSION_ATTRIBUTE, bundleVersion);
String symbolicName = getSupplier().getSymbolicName();
- if (symbolicName != null)
- result.put(Constants.BUNDLE_SYMBOLICNAME_ATTRIBUTE, symbolicName);
+ if (symbolicName != null) {
+ if (symbolicName.equals(Constants.getInternalSymbolicName()))
+ result.put(Constants.BUNDLE_SYMBOLICNAME_ATTRIBUTE, Arrays.asList(Constants.SYSTEM_BUNDLE_SYMBOLICNAME, symbolicName));
+ else
+ result.put(Constants.BUNDLE_SYMBOLICNAME_ATTRIBUTE, symbolicName);
+ }
return Collections.unmodifiableMap(result);
}
}

Back to the top