From 398ca82b481015e71b5928c2b83c484fbf1e9b4d Mon Sep 17 00:00:00 2001 From: Nathan Ridge Date: Wed, 30 Aug 2017 19:00:33 -0400 Subject: [PATCH] Bug 521265 - Check that the platform is running before querying bundle group providers in CCorePlugin.getCDTFeatureVersion() Change-Id: I5910e8c7decd7c8a347ca640f9c99875ad95fcf6 --- .../src/org/eclipse/cdt/core/CCorePlugin.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java index f74632e64ff..5b677382683 100644 --- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java +++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CCorePlugin.java @@ -1641,13 +1641,15 @@ public class CCorePlugin extends Plugin { * @since 6.3 */ public static Version getCDTFeatureVersion() { - IBundleGroupProvider[] providers = Platform.getBundleGroupProviders(); - if (providers != null) { - for (IBundleGroupProvider provider : providers) { - IBundleGroup[] bundleGroups = provider.getBundleGroups(); - for (IBundleGroup group : bundleGroups) { - if (group.getIdentifier().equals(CDT_FEATURE_ID)) { - return new Version(group.getVersion()); + if (Platform.isRunning()) { + IBundleGroupProvider[] providers = Platform.getBundleGroupProviders(); + if (providers != null) { + for (IBundleGroupProvider provider : providers) { + IBundleGroup[] bundleGroups = provider.getBundleGroups(); + for (IBundleGroup group : bundleGroups) { + if (group.getIdentifier().equals(CDT_FEATURE_ID)) { + return new Version(group.getVersion()); + } } } }