Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Goldthorpe2011-06-23 00:00:41 +0000
committerChris Goldthorpe2011-06-23 00:00:41 +0000
commit7f1fbe5be5b7de5fbd40c25d1c5b4167318f4088 (patch)
treeeb5b676c9e398bbcdc09780d9219ac1a819173d6
parente4d0368a78bd8e8c33ad84870c922f240c2040c1 (diff)
downloadeclipse.platform.ua-7f1fbe5be5b7de5fbd40c25d1c5b4167318f4088.tar.gz
eclipse.platform.ua-7f1fbe5be5b7de5fbd40c25d1c5b4167318f4088.tar.xz
eclipse.platform.ua-7f1fbe5be5b7de5fbd40c25d1c5b4167318f4088.zip
Bug 249761 - [Help] Missing org.eclipse.equinox.http.registry causes NPE in WebappManager's checkBundle()
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/server/JettyHelpServer.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/server/JettyHelpServer.java b/org.eclipse.help.base/src/org/eclipse/help/internal/server/JettyHelpServer.java
index 8178edb7d..1a01dec3f 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/server/JettyHelpServer.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/server/JettyHelpServer.java
@@ -114,7 +114,10 @@ public class JettyHelpServer extends HelpServer {
* version is started and reads the port number
*/
protected void checkBundle() throws InvalidSyntaxException, BundleException {
- Bundle bundle = Platform.getBundle("org.eclipse.equinox.http.registry"); //$NON-NLS-1$if (bundle != null) {
+ Bundle bundle = Platform.getBundle("org.eclipse.equinox.http.registry"); //$NON-NLS-1$
+ if (bundle == null) {
+ throw new BundleException("org.eclipse.equinox.http.registry"); //$NON-NLS-1$
+ }
if (bundle.getState() == Bundle.RESOLVED) {
bundle.start(Bundle.START_TRANSIENT);
}

Back to the top