mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

fixed NPE when loading c descriptors

Browse source 
Change-Id: I84db8063ab43d00bbed42c40f8a7601031ef8bb1
This commit is contained in:
Alena Laskavaia 2016-05-11 14:24:05 -04:00
parent 2c4921bca0
commit 2f58cf231e
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/BuildInfoFactory.java
View file

@ -23,6 +23,7 @@ import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
import org.eclipse.cdt.core.settings.model.ICProjectDescription; import org.eclipse.cdt.core.settings.model.ICProjectDescription;
import org.eclipse.cdt.core.settings.model.extension.CBuildData; import org.eclipse.cdt.core.settings.model.extension.CBuildData;
import org.eclipse.cdt.core.settings.model.extension.CConfigurationData;
import org.eclipse.cdt.make.core.IMakeBuilderInfo; import org.eclipse.cdt.make.core.IMakeBuilderInfo;
import org.eclipse.cdt.make.core.IMakeCommonBuildInfo; import org.eclipse.cdt.make.core.IMakeCommonBuildInfo;
import org.eclipse.cdt.make.core.MakeCorePlugin; import org.eclipse.cdt.make.core.MakeCorePlugin;
@ -505,9 +506,12 @@ public class BuildInfoFactory {
ICProjectDescription cProjectDescription = CoreModel.getDefault().getProjectDescription(project, false); ICProjectDescription cProjectDescription = CoreModel.getDefault().getProjectDescription(project, false);
if(cProjectDescription != null) { if(cProjectDescription != null) {
ICConfigurationDescription cConfigDescription = cProjectDescription.getActiveConfiguration(); ICConfigurationDescription cConfigDescription = cProjectDescription.getActiveConfiguration();
CBuildData buildData = cConfigDescription.getConfigurationData().getBuildData(); CConfigurationData configurationData = cConfigDescription.getConfigurationData();
if(buildData != null) { if (configurationData != null) {
builder = buildData.getBuildSpecCommand(); CBuildData buildData = configurationData.getBuildData();
if (buildData != null) {
builder = buildData.getBuildSpecCommand();
}
} }
} }