Merge remote-tracking branch 'origin/master' into AndroidSupport

This commit is contained in:
John J. Aylward
2017-10-27 13:28:20 -04:00
6 changed files with 187 additions and 82 deletions

View File

@@ -172,7 +172,7 @@ public class JSONML {
if (!(token instanceof String)) {
throw x.syntaxError("Missing value");
}
newjo.accumulate(attribute, keepStrings ? XML.unescape((String)token) :XML.stringToValue((String)token));
newjo.accumulate(attribute, keepStrings ? ((String)token) :XML.stringToValue((String)token));
token = null;
} else {
newjo.accumulate(attribute, "");