Skip to content

Commit 9761089

Browse files
authored
Fix NPE in S3BlobContainer (#96168)
Relates #96019 Closes #96162
1 parent fe1c82d commit 9761089

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ public void compareAndExchangeRegister(
803803
ActionListener.run(ActionListener.releaseAfter(listener.delegateResponse((delegate, e) -> {
804804
if (e instanceof AmazonS3Exception amazonS3Exception && amazonS3Exception.getStatusCode() == 404) {
805805
// an uncaught 404 means that our multipart upload was aborted by a concurrent operation before we could complete it
806-
delegate.onResponse(null);
806+
delegate.onResponse(OptionalBytesReference.MISSING);
807807
} else {
808808
delegate.onFailure(e);
809809
}

x-pack/plugin/snapshot-repo-test-kit/qa/s3/src/javaRestTest/java/org/elasticsearch/repositories/blobstore/testkit/S3SnapshotRepoTestKitIT.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,4 @@ protected Settings repositorySettings() {
2828

2929
return Settings.builder().put("client", "repo_test_kit").put("bucket", bucket).put("base_path", basePath).build();
3030
}
31-
32-
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/96162")
33-
@Override
34-
public void testRepositoryAnalysis() throws Exception {
35-
super.testRepositoryAnalysis();
36-
}
3731
}

0 commit comments

Comments
 (0)