Attachment #25076 for bug #104477

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 104477
Collapse All | Expand All




		// 5) search the local bundle
		if (result == null)
			result = findLocalResources(name);
		else {
			//compound the required source results with the local ones
			Enumeration localResults = findLocalResources(name);
			if (localResults != null) {
				Vector compoundResults = new Vector();
				while (result.hasMoreElements())
					compoundResults.add(result.nextElement());
				while (localResults.hasMoreElements())
					compoundResults.add(localResults.nextElement());
				result = compoundResults.elements();
			}
		}
		if (result != null)
			return result;
		// 6) attempt to find a dynamic import source





import java.net.URL;
import java.util.Enumeration;
import java.util.Vector;

public class MultiSourcePackage extends PackageSource {
	SingleSourcePackage[] suppliers;

	}

	public Enumeration getResources(String name) {
		Enumeration firstResult = null;
		Vector compoundResults = null;
		for (int i = 0; i < suppliers.length; i++) {
			Enumeration resources = suppliers[i].getResources(name);
			if (resources != null) {
				if (firstResult == null)
					firstResult = resources;
				else {
					if (compoundResults == null) {
						compoundResults = new Vector();
						while (firstResult.hasMoreElements())
							compoundResults.add(firstResult.nextElement());
					}
					while (resources.hasMoreElements())
						compoundResults.add(resources.nextElement());
				}
			}
		}
		return compoundResults == null ? firstResult : compoundResults.elements();
	}
}

Return to bug 104477

Lines 532-537 Link Here

(-)core/framework/org/eclipse/osgi/framework/internal/core/BundleLoader.java (+12 lines)
532	// 5) search the local bundle	532	// 5) search the local bundle
533	if (result == null)	533	if (result == null)
534	result = findLocalResources(name);	534	result = findLocalResources(name);
		535	else {
		536	//compound the required source results with the local ones
		537	Enumeration localResults = findLocalResources(name);
		538	if (localResults != null) {
		539	Vector compoundResults = new Vector();
		540	while (result.hasMoreElements())
		541	compoundResults.add(result.nextElement());
		542	while (localResults.hasMoreElements())
		543	compoundResults.add(localResults.nextElement());
		544	result = compoundResults.elements();
		545	}
		546	}
535	if (result != null)	547	if (result != null)
536	return result;	548	return result;
537	// 6) attempt to find a dynamic import source	549	// 6) attempt to find a dynamic import source

Lines 12-17 Link Here

(-)core/framework/org/eclipse/osgi/framework/internal/core/MultiSourcePackage.java (-5 / +18 lines)
12		12
13	import java.net.URL;	13	import java.net.URL;
14	import java.util.Enumeration;	14	import java.util.Enumeration;
		15	import java.util.Vector;
15		16
16	public class MultiSourcePackage extends PackageSource {	17	public class MultiSourcePackage extends PackageSource {
17	SingleSourcePackage[] suppliers;	18	SingleSourcePackage[] suppliers;
Lines 46-57 Link Here
46	}	47	}
47		48
48	public Enumeration getResources(String name) {	49	public Enumeration getResources(String name) {
49	Enumeration result = null;	50	Enumeration firstResult = null;
		51	Vector compoundResults = null;
50	for (int i = 0; i < suppliers.length; i++) {	52	for (int i = 0; i < suppliers.length; i++) {
51	result = suppliers[i].getResources(name);	53	Enumeration resources = suppliers[i].getResources(name);
52	if (result != null)	54	if (resources != null) {
53	return result;	55	if (firstResult == null)
		56	firstResult = resources;
		57	else {
		58	if (compoundResults == null) {
		59	compoundResults = new Vector();
		60	while (firstResult.hasMoreElements())
		61	compoundResults.add(firstResult.nextElement());
		62	}
		63	while (resources.hasMoreElements())
		64	compoundResults.add(resources.nextElement());
		65	}
		66	}
54	}	67	}
55	return result;	68	return compoundResults == null ? firstResult : compoundResults.elements();
56	}	69	}
57	}	70	}