# HG changeset patch # User wpaul # Date 1278682124 18000 # Node ID 7f5fae281d7c4cf9b9f2556eda1c890cdd6010cb # Parent 7058cea84a31678a7e660d5661ea4953402cc5a2 merged fix from default for bug #11625. diff -r 7058cea84a31 -r 7f5fae281d7c 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 Thu Jul 08 20:06:31 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/EnvironmentVarsInfo2.java Fri Jul 09 08:28:44 2010 -0500 @@ -441,8 +441,11 @@ private Map stringArrayToMap(String[] array) { Map map = new HashMap(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;