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

use existing mapping when merging

This commit is contained in:
kimchy 2010-03-01 14:25:50 +02:00
parent 0ef4000842
commit 4c9cf299e6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/elasticsearch/src/main/java/org/elasticsearch/cluster/metadata/MetaDataService.java
View File

@ -262,7 +262,7 @@ public class MetaDataService extends AbstractComponent {
if (!ignoreConflicts && mergeResult.hasConflicts()) { if (!ignoreConflicts && mergeResult.hasConflicts()) {
throw new MergeMappingException(mergeResult.conflicts()); throw new MergeMappingException(mergeResult.conflicts());
} }
existingMappers.put(index, newMapper); existingMappers.put(index, existingMapper);
} }
} else { } else {
throw new IndexMissingException(new Index(index)); throw new IndexMissingException(new Index(index));