Using local variable for merged meta

alexshadow007 · alexshadow007 · commit c13794602303 · 2017-11-18T00:16:36.000+03:00
diff --git a/core/src/main/java/org/elasticsearch/index/mapper/Mapping.java b/core/src/main/java/org/elasticsearch/index/mapper/Mapping.java
@@ -98,8 +98,8 @@ public Mapping merge(Mapping mergeWith, boolean updateAllTypes) {
             }
             mergedMetaDataMappers.put(merged.getClass(), merged);
         }
-        return new Mapping(indexCreated, mergedRoot, mergedMetaDataMappers.values().toArray(new MetadataFieldMapper[0]),
-            mergeWith.meta != null ? mergeWith.meta : meta);
+        Map<String, Object> mergedMeta = mergeWith.meta == null ? meta : mergeWith.meta;
+        return new Mapping(indexCreated, mergedRoot, mergedMetaDataMappers.values().toArray(new MetadataFieldMapper[0]), mergedMeta);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -98,8 +98,8 @@ public Mapping merge(Mapping mergeWith, boolean updateAllTypes) {`
`98`	`98`	`}`
`99`	`99`	`mergedMetaDataMappers.put(merged.getClass(), merged);`
`100`	`100`	`}`
`101`		`- return new Mapping(indexCreated, mergedRoot, mergedMetaDataMappers.values().toArray(new MetadataFieldMapper[0]),`
`102`		`- mergeWith.meta != null ? mergeWith.meta : meta);`
	`101`	`+ Map<String, Object> mergedMeta = mergeWith.meta == null ? meta : mergeWith.meta;`
	`102`	`+ return new Mapping(indexCreated, mergedRoot, mergedMetaDataMappers.values().toArray(new MetadataFieldMapper[0]), mergedMeta);`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`/**`