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

fix wrong closing of possible null mappings in geo point mapping

This commit is contained in:
kimchy 2011-04-22 04:29:47 +03:00
parent d517c3dfef
commit 6ed2624772
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/xcontent/geo/GeoPointFieldMapper.java
View File

@ -340,8 +340,18 @@ public class GeoPointFieldMapper implements XContentMapper, ArrayValueMapperPars
} }
@Override public void close() { @Override public void close() {
latMapper.close(); if (latMapper != null) {
lonMapper.close(); latMapper.close();
}
if (lonMapper != null) {
lonMapper.close();
}
if (geohashMapper != null) {
geohashMapper.close();
}
if (geoStringMapper != null) {
geoStringMapper.close();
}
} }
@Override public void merge(XContentMapper mergeWith, MergeContext mergeContext) throws MergeMappingException { @Override public void merge(XContentMapper mergeWith, MergeContext mergeContext) throws MergeMappingException {