for (String v : globVals)
{
v = makeSubstitutions(v);
- SubVals vsv = new SubVals(globSubVals == null ? null
- : globSubVals.getSubValsMap(), v);
+ SubVals vsv = new SubVals(globSubVals, v);
avs.addValue(vsv, v, argIndex++);
argIndexIncremented = true;
}