From 2cea3eba8bf34ac57c35a51ab19f276ca7223385 Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Mon, 28 Sep 2020 22:50:32 -0400 Subject: [PATCH] Bug 567169 - Detection for VS 2017 and VS2019 toolchain Fix a NPE I just introduced. This method gets called before things are initialized, just like before. I prefer being conservative by restoring previous behavior and not change too many things by revising the initialization sequence at the same time of other bigger changes. Change-Id: I1096621e29b51c67d218c7e55eaf3ebe29858d07 Signed-off-by: Marc-Andre Laperle --- .../eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java index 7ff261cab33..7f9a7c44b28 100644 --- a/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java +++ b/windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/msw/build/WinEnvironmentVariableSupplier.java @@ -100,7 +100,9 @@ public class WinEnvironmentVariableSupplier } public static IPath[] getIncludePath() { - // Include paths + if (envvars == null) + return new IPath[0]; + IBuildEnvironmentVariable var = envvars.get("INCLUDE"); //$NON-NLS-1$ if (var == null) return new IPath[0];