Handle null parser (#57071)

elastic · May 26, 2020 · b4b31ef · b4b31ef
1 parent 93c557e
commit b4b31ef
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/...src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateDataStreamAction.java b/...src/main/java/org/elasticsearch/rest/action/admin/indices/RestCreateDataStreamAction.java
@@ -47,10 +47,12 @@ public List<Route> routes() {
     protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException {
         CreateDataStreamAction.Request putDataStreamRequest = new CreateDataStreamAction.Request(request.param("name"));
         request.withContentOrSourceParamParserOrNull(parser -> {
-            Map<String, Object> body = parser.map();
-            String timeStampFieldName = (String) body.get(DataStream.TIMESTAMP_FIELD_FIELD.getPreferredName());
-            if (timeStampFieldName != null) {
-                putDataStreamRequest.setTimestampFieldName(timeStampFieldName);
+            if (parser != null) {
+                Map<String, Object> body = parser.map();
+                String timeStampFieldName = (String) body.get(DataStream.TIMESTAMP_FIELD_FIELD.getPreferredName());
+                if (timeStampFieldName != null) {
+                    putDataStreamRequest.setTimestampFieldName(timeStampFieldName);
+                }
             }
         });
         return channel -> client.admin().indices().createDataStream(putDataStreamRequest, new RestToXContentListener<>(channel));