Geo: Improved error handling in geo_distance

geo_distance filter now throws a parse exception if no distance parameter is supplied Close #7260
elastic · Aug 14, 2014 · 7602b13 · 7602b13
1 parent 6023a3a
commit 7602b13
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/main/java/org/elasticsearch/index/query/GeoDistanceFilterParser.java b/src/main/java/org/elasticsearch/index/query/GeoDistanceFilterParser.java
@@ -141,7 +141,9 @@ public Filter parse(QueryParseContext parseContext) throws IOException, QueryPar
             }
         }
 
-        if (vDistance instanceof Number) {
+        if (vDistance == null) {
+            throw new QueryParsingException(parseContext.index(), "geo_distance requires 'distance' to be specified");
+        } else if (vDistance instanceof Number) {
             distance = DistanceUnit.DEFAULT.convert(((Number) vDistance).doubleValue(), unit);
         } else {
             distance = DistanceUnit.parse((String) vDistance, unit, DistanceUnit.DEFAULT);