honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

can't check on token value, since it might be valid, so, handle the null token case better

This commit is contained in:
kimchy 2011-03-19 21:34:31 +02:00
parent c19a93da89
commit f3160b71bb
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/ObjectMapper.java
View File

@ -295,8 +295,6 @@ public class ObjectMapper implements XContentMapper, IncludeInAllMapper {
if (token == XContentParser.Token.START_OBJECT) {
// if we are just starting an OBJECT, advance, this is the object we are parsing, we need the name first
token = parser.nextToken();
} else if (token.isValue()) {
throw new MapperParsingException("object_mapper [" + name + "] expected object type, but got value [" + token + "]");
}
while (token != XContentParser.Token.END_OBJECT) {
if (token == XContentParser.Token.START_OBJECT) {
@ -308,7 +306,7 @@ public class ObjectMapper implements XContentMapper, IncludeInAllMapper {
} else if (token == XContentParser.Token.VALUE_NULL) {
serializeNullValue(context, currentFieldName);
} else if (token == null) {
throw new MapperParsingException("object_mapper [" + name + "] tried to parse as object, but got EOF");
throw new MapperParsingException("object_mapper [" + name + "] tried to parse as object, but got EOF, has a concrete value been provided to it?");
} else if (token.isValue()) {
serializeValue(context, currentFieldName, token);
}