Skip to content

Commit e4593c7

Browse files
committed
Prevent NPE parsing the stop datafeed request. (#33347)
The issue depends on the request parameters being passed in the request body rather than as query parameters.
1 parent 6317e38 commit e4593c7

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/action/StopDatafeedAction.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,13 @@ public static Request parseRequest(String datafeedId, XContentParser parser) {
7979
}
8080

8181
private String datafeedId;
82-
private String[] resolvedStartedDatafeedIds;
82+
private String[] resolvedStartedDatafeedIds = new String[] {};
8383
private TimeValue stopTimeout = DEFAULT_TIMEOUT;
8484
private boolean force = false;
8585
private boolean allowNoDatafeeds = true;
8686

8787
public Request(String datafeedId) {
8888
this.datafeedId = ExceptionsHelper.requireNonNull(datafeedId, DatafeedConfig.ID.getPreferredName());
89-
this.resolvedStartedDatafeedIds = new String[] { datafeedId };
9089
}
9190

9291
public Request() {

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/action/StopDatafeedActionRequestTests.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ protected Request createTestInstance() {
2424
if (randomBoolean()) {
2525
request.setAllowNoDatafeeds(randomBoolean());
2626
}
27+
if (randomBoolean()) {
28+
request.setResolvedStartedDatafeedIds(generateRandomStringArray(4, 8, false));
29+
}
2730
return request;
2831
}
2932

0 commit comments

Comments
 (0)