mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-03-28 14:56:28 +01:00
Code Issues Wiki Activity

Fix NPE in LaunchBarManager

Browse source 
This comes up when doing headless DSF-GDB tests, not sure users can
hit it, but rather than logging an NPE, just check for it upfront.

Change-Id: I224b7e3a881c5e7bc2e1c1b00c1c3da58c745567
This commit is contained in:
Jonah Graham 2021-04-05 13:52:56 -04:00
parent 2fae0b79c2
commit f89c3c3003
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
launchbar/org.eclipse.launchbar.core/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.launchbar.core;singleton:=true
Bundle-Version: 2.4.100.qualifier
Bundle-Version: 2.4.200.qualifier
Bundle-Activator: org.eclipse.launchbar.core.internal.Activator
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime,

7
launchbar/org.eclipse.launchbar.core/src/org/eclipse/launchbar/core/internal/LaunchBarManager.java
View file

@ -932,8 +932,11 @@ public class LaunchBarManager implements ILaunchBarManager, ILaunchTargetListene
for (LaunchConfigProviderInfo providerInfo : configProviders.get(descTypeInfo.getId())) {
try {
if (providerInfo.enabled(configuration)) {
if (providerInfo.getProvider().launchConfigurationChanged(configuration)) {
return;
ILaunchConfigurationProvider provider = providerInfo.getProvider();
if (provider != null) {
if (provider.launchConfigurationChanged(configuration)) {
return;
}
}
}
} catch (Throwable e) {