Bug 365677 - WeavingHook causes failure due to missing packages
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 795f3a2..4bc7658 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 @@
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);
}
}
