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

Mapping: Using _default_ mapping type with _source excludes (or array based config) can cause the array to grow indefinitely 

closes #2317
This commit is contained in:
Shay Banon 2012-10-11 19:02:06 -07:00
parent 27562270ca
commit 384286d463
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/elasticsearch/common/xcontent/XContentHelper.java
View File

@ -32,7 +32,6 @@ import org.elasticsearch.common.io.stream.BytesStreamInput;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -241,8 +240,13 @@ public class XContentHelper {
} }
} else { } else {
// if both are lists, simply combine them, first the defaults, then the content // if both are lists, simply combine them, first the defaults, then the content
mergedList.addAll((Collection) defaultEntry.getValue()); // just make sure not to add the same value twice
mergedList.addAll((Collection) content.get(defaultEntry.getKey())); mergedList.addAll(defaultList);
for (Object o : contentList) {
if (!mergedList.contains(o)) {
mergedList.add(o);
}
}
} }
content.put(defaultEntry.getKey(), mergedList); content.put(defaultEntry.getKey(), mergedList);
} }