Fix crash when environment contains non-standard variable settings
authorEd Swartz <ed.swartz@nokia.com>
Thu, 28 Jan 2010 09:46:46 -0600
changeset 837 eb9903eb5352
parent 827 ba25abd59060
child 838 381d143dacc3
Fix crash when environment contains non-standard variable settings
builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java	Tue Jan 26 14:36:17 2010 -0600
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java	Thu Jan 28 09:46:46 2010 -0600
@@ -461,8 +461,11 @@
 	private Map<String, String> stringArrayToMap(String[] array) {
 		Map<String, String> map = new HashMap<String, String>(array.length);
 		for (String var : array) {
-			String[] split = var.split("=");
-			map.put(split[0], split[1]);
+			int idx = var.indexOf('=');
+			if (idx > 0)
+				map.put(var.substring(0, idx), var.substring(idx+1));
+			else if (var.length() > 0)
+				map.put(var, "");
 		}
 		
 		return map;