Skip to content

Commit

Permalink
v2.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
zhegexiaohuozi committed Feb 14, 2019
1 parent 8b32871 commit a34406a
Showing 1 changed file with 8 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,14 @@ public XValue visitUnionExprNoRoot(XpathParser.UnionExprNoRootContext ctx) {
throw new XpathMergeValueException("can not merge val1="+pathExprNoRoot.asDouble()+",val2="+unionExprNoRoot.asString());
}
}else {
return XValue.create(pathExprNoRoot.asString()+","+unionExprNoRoot.asString());
List<String> tmpVal = new LinkedList<>();
if (StringUtils.isNotBlank(pathExprNoRoot.asString())){
tmpVal.add(pathExprNoRoot.asString());
}
if (StringUtils.isNotBlank(unionExprNoRoot.asString())){
tmpVal.add(unionExprNoRoot.asString());
}
return XValue.create(StringUtils.join(tmpVal,","));
}
}

Expand Down

0 comments on commit a34406a

Please sign in to comment.