Bug 423093 - Allow ClassLoaderHook to provide a parent class loader

2 files changed, 23 insertions, 0 deletions

diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java
index 92538b4ae..b2dbb2bc3 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/framework/EquinoxContainerAdaptor.java
@@ -16,6 +16,7 @@ import java.util.concurrent.atomic.AtomicLong;
 import org.eclipse.osgi.container.*;
 import org.eclipse.osgi.container.Module.Settings;
 import org.eclipse.osgi.container.Module.State;
+import org.eclipse.osgi.internal.hookregistry.ClassLoaderHook;
 import org.eclipse.osgi.internal.loader.*;
 import org.eclipse.osgi.internal.permadmin.BundlePermissions;
 import org.eclipse.osgi.service.debug.DebugOptions;
@@ -45,6 +46,15 @@ public class EquinoxContainerAdaptor extends ModuleContainerAdaptor {
 	}
 
 	private static ClassLoader getModuleClassLoaderParent(EquinoxConfiguration configuration) {
+		// allow hooks to determine the parent class loader
+		for (ClassLoaderHook hook : configuration.getHookRegistry().getClassLoaderHooks()) {
+			ClassLoader parent = hook.getModuleClassLoaderParent(configuration);
+			if (parent != null) {
+				// first one to return non-null wins.
+				return parent;
+			}
+		}
+		// DEFAULT behavior:
 		// check property for specified parent
 		// check the osgi defined property first
 		String type = configuration.getConfiguration(Constants.FRAMEWORK_BUNDLE_PARENT);
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/ClassLoaderHook.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/ClassLoaderHook.java
index 8cc43a89c..fba067d67 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/ClassLoaderHook.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/hookregistry/ClassLoaderHook.java
@@ -264,4 +264,17 @@ public abstract class ClassLoaderHook {
 		// do nothing
 	}
 
+	/**
+	 * Returns the parent class loader to be used by all ModuleClassLoaders.
+	 * A {@code null} value may be returned if this hook does not supply the parent.
+	 * Only one hook is able to provide the implementation of the parent class loader
+	 * and the first one to return non-null wins.
+	 * @param configuration the equinox configuration
+	 * @return the parent class loader to be used by all ModuleClassLoaders
+	 */
+	public ClassLoader getModuleClassLoaderParent(EquinoxConfiguration configuration) {
+		// do nothing by default
+		return null;
+	}
+
 }