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

Bug 529121 - NPE fix for projects created with CMake

Browse source 
Not sure what changed but the launcher for these projects is now
returning null for an environment. Added a null check.

Change-Id: I05c94bb77f951f417577d0c2a3e3b4b6b996214b
This commit is contained in:
Doug Schaefer 2018-01-10 11:26:23 -05:00
parent a293032938
commit be9c1b8338
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/core/MakeBuilder.java
View file

@ -246,7 +246,9 @@ public class MakeBuilder extends ACBuilder {
if (info.appendEnvironment()) {
@SuppressWarnings({"unchecked", "rawtypes"})
Map<String, String> env = (Map)launcher.getEnvironment();
envMap.putAll(env);
if (env != null) {
envMap.putAll(env);
}
}
envMap.putAll(info.getExpandedEnvironment());
return envMap;