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

don't add the same object twice under rare cases where multiple threads are introducing the same new dynamic object

This commit is contained in:
kimchy 2010-08-10 09:18:53 +03:00
parent 96710fde24
commit 879191c435
1 changed files with 7 additions and 7 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/XContentObjectMapper.java
View File

@ -363,8 +363,7 @@ public class XContentObjectMapper implements XContentMapper, XContentIncludeInAl
objectMapper = mappers.get(currentFieldName);
if (objectMapper != null) {
objectMapper.parse(context);
}
} else {
BuilderContext builderContext = new BuilderContext(context.path());
objectMapper = XContentMapperBuilders.object(currentFieldName).enabled(true)
.dynamic(dynamic).pathType(pathType).dateTimeFormatter(dateTimeFormatters).build(builderContext);
@ -372,6 +371,7 @@ public class XContentObjectMapper implements XContentMapper, XContentIncludeInAl
objectMapper.parse(context);
context.addedMapper();
}
}
} else {
// not dynamic, read everything up to end object
context.parser().skipChildren();