Attachment #56499 for bug #155996

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

View | Details | Raw Unified | Return to bug 155996
Collapse All | Expand All




						BundleDescription description = bundles[i].getBundleDescription();
						if (description != null && description.getBundleId() != 0 && !results.contains(description))
							results.add(description);
						// add in any bundles that have the same symbolic name see bug (169593)
						AbstractBundle[] sameNames = framework.bundles.getBundles(bundles[i].getSymbolicName());
						if (sameNames != null && sameNames.length > 1) {
							for (int j = 0; j < sameNames.length; j++)
								if (sameNames[j] != bundles[i]) {
									BundleDescription sameName = sameNames[j].getBundleDescription();
									if (sameName != null && sameName.getBundleId() != 0 && !results.contains(sameName))
										results.add(sameName);
								}
						}

Return to bug 155996

Lines 200-212 Link Here

(-)core/framework/org/eclipse/osgi/framework/internal/core/PackageAdminImpl.java (-2 / +2 lines)
200	BundleDescription description = bundles[i].getBundleDescription();	200	BundleDescription description = bundles[i].getBundleDescription();
201	if (description != null && description.getBundleId() != 0 && !results.contains(description))	201	if (description != null && description.getBundleId() != 0 && !results.contains(description))
202	results.add(description);	202	results.add(description);
203	// add in any singleton bundles if needed	203	// add in any bundles that have the same symbolic name see bug (169593)
204	AbstractBundle[] sameNames = framework.bundles.getBundles(bundles[i].getSymbolicName());	204	AbstractBundle[] sameNames = framework.bundles.getBundles(bundles[i].getSymbolicName());
205	if (sameNames != null && sameNames.length > 1) {	205	if (sameNames != null && sameNames.length > 1) {
206	for (int j = 0; j < sameNames.length; j++)	206	for (int j = 0; j < sameNames.length; j++)
207	if (sameNames[j] != bundles[i]) {	207	if (sameNames[j] != bundles[i]) {
208	BundleDescription sameName = sameNames[j].getBundleDescription();	208	BundleDescription sameName = sameNames[j].getBundleDescription();
209	if (sameName != null && sameName.getBundleId() != 0 && sameName.isSingleton() && !results.contains(sameName))	209	if (sameName != null && sameName.getBundleId() != 0 && !results.contains(sameName))
210	results.add(sameName);	210	results.add(sameName);
211	}	211	}
212	}	212	}