Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2011-11-15 11:15:06 -0500
committerThomas Watson2011-11-15 11:15:06 -0500
commit5a42c6ea2f82c3769228b69b3b1e4d706e0f0f4e (patch)
tree4ab37b276a599bd008b75c191b408930f76ce0ed /bundles/org.eclipse.osgi
parent3ad7aae358066c7fe4ffebd230ea14f132468892 (diff)
downloadrt.equinox.framework-5a42c6ea2f82c3769228b69b3b1e4d706e0f0f4e.tar.gz
rt.equinox.framework-5a42c6ea2f82c3769228b69b3b1e4d706e0f0f4e.tar.xz
rt.equinox.framework-5a42c6ea2f82c3769228b69b3b1e4d706e0f0f4e.zip
Bug 363797 - NullPointerException in CompositeConfigurator.createClassLoaderR36x_v20111115
Diffstat (limited to 'bundles/org.eclipse.osgi')
-rw-r--r--bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeImpl.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeImpl.java b/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeImpl.java
index f900dc6fa..143027660 100644
--- a/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeImpl.java
+++ b/bundles/org.eclipse.osgi/core/composite/org/eclipse/osgi/internal/composite/CompositeImpl.java
@@ -167,6 +167,9 @@ public class CompositeImpl extends CompositeBase implements CompositeBundle {
}
protected void stopHook() throws BundleException {
+ // bug 363561; need to make sure the class loader is created
+ // before stopping the composite framework
+ checkClassLoader();
trackerManager.stoppedComposite();
// do not stop the framework unless we are persistently stopped
if ((bundledata.getStatus() & Constants.BUNDLE_STARTED) == 0)

Back to the top