Skip to content

Commit a9fc213

Browse files
authored
Fixed NullPointerException on bulk request (#88358)
Java's `ArrayList.toArray()` returns provided array when collection is empty. Here is created a one-element array which contains null element. Thus, returned `BulkResponse` may contains a null element as `BulkItemResponse`.
1 parent 7dc02c5 commit a9fc213

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

docs/changelog/88358.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 88385
2+
summary: Fixed NullPointerException on bulk request
3+
area: Distributed
4+
type: bug
5+
issues: []

server/src/main/java/org/elasticsearch/action/bulk/Retry.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ private void addResponses(BulkResponse response, Predicate<BulkItemResponse> fil
195195
private BulkResponse getAccumulatedResponse() {
196196
BulkItemResponse[] itemResponses;
197197
synchronized (responses) {
198-
itemResponses = responses.toArray(new BulkItemResponse[1]);
198+
itemResponses = responses.toArray(new BulkItemResponse[0]);
199199
}
200200
long stopTimestamp = System.nanoTime();
201201
long totalLatencyMs = TimeValue.timeValueNanos(stopTimestamp - startTimestampNanos).millis();

0 commit comments

Comments
 (0)