From f5170f0ccef93cbf01ee3fe7f2b6bb947bed2b91 Mon Sep 17 00:00:00 2001
From: Alena Laskavaia <elaskavaia.cdt@gmail.com>
Date: Tue, 6 Oct 2015 12:47:53 -0400
Subject: [PATCH] Bug 478244 - Empty environment variables result in NPEs

java.lang.NullPointerException
        at
org.eclipse.cdt.utils.envvar.EnvVarOperationProcessor.convertToList(EnvVarOperationProcessor.java:158)
        at
org.eclipse.cdt.managedbuilder.internal.envvar.EnvironmentVariableProvider$DefaultBuildPathResolver.resolveBuildPaths(EnvironmentVariableProvider.java:72)

Change-Id: I46e9e990685bf29d1ddd90496e277c049e358a02
---
 .../org/eclipse/cdt/utils/envvar/EnvVarOperationProcessor.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/envvar/EnvVarOperationProcessor.java b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/envvar/EnvVarOperationProcessor.java
index e2594ddcdfa..0920501192d 100644
--- a/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/envvar/EnvVarOperationProcessor.java
+++ b/core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/envvar/EnvVarOperationProcessor.java
@@ -153,6 +153,8 @@ public class EnvVarOperationProcessor {
 	 * @param delimiter
 	 */
 	static public List<String> convertToList(String value, String delimiter){
+		if (value == null)
+			value = ""; //$NON-NLS-1$
 		List<String> list = new ArrayList<String>();
 		int delLength = delimiter.length();
 		int valLength = value.length();