diff options
| author | Andrey Loskutov | 2015-12-09 13:38:17 +0000 |
|---|---|---|
| committer | Thomas Watson | 2015-12-18 14:01:48 +0000 |
| commit | a64641e4a1336330520ff90096503a4a55ab9cf9 (patch) | |
| tree | e0b88261bfad841a45bb23db93731905e1c5f3e9 | |
| parent | e09eecb45b28f0add5dbcf2a9b7d3e813522ff88 (diff) | |
| download | rt.equinox.bundles-a64641e4a1336330520ff90096503a4a55ab9cf9.tar.gz rt.equinox.bundles-a64641e4a1336330520ff90096503a4a55ab9cf9.tar.xz rt.equinox.bundles-a64641e4a1336330520ff90096503a4a55ab9cf9.zip | |
Bug 484014 - NPE in Extension.getExtensionPointIdentifier breaks theI20160105-1000I20160105-0800I20151229-0800I20151222-0800
entire Java IDE
Change-Id: I736e54887e4998bf2b2f94a7570b0eac294a38cb
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
| -rw-r--r-- | bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Extension.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Extension.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Extension.java index a17e80128..62943ac18 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Extension.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/Extension.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2009 IBM Corporation and others. + * Copyright (c) 2000, 2015 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -7,6 +7,7 @@ * * Contributors: * IBM Corporation - initial API and implementation + * Andrey Loskutov <loskutov@gmx.de> - bug 484014 *******************************************************************************/ package org.eclipse.core.internal.registry; @@ -47,7 +48,11 @@ public class Extension extends RegistryObject { } protected String getExtensionPointIdentifier() { - return getExtraData()[XPT_NAME]; + String[] extraData = getExtraData(); + if (extraData == null) { + return null; + } + return extraData[XPT_NAME]; } protected String getSimpleIdentifier() { |