Fix EncryptedRepository#cleanup bug

albertzaharovits · albertzaharovits · commit ef4c86054c89 · 2020-02-25T13:05:56.000+02:00
diff --git a/x-pack/plugin/repository-encrypted/src/main/java/org/elasticsearch/repositories/encrypted/EncryptedRepository.java b/x-pack/plugin/repository-encrypted/src/main/java/org/elasticsearch/repositories/encrypted/EncryptedRepository.java
@@ -409,8 +409,8 @@ private DeleteResult cleanUnreferencedEncryptionMetadata(EncryptedBlobContainer
                 metadataBlobsToDelete.add(blobNameAndMetaId.v1());
             }
             // group metadata blobs by their associated blob name
-            metaDataByBlobName.putIfAbsent(blobNameAndMetaId.v1(), new ArrayList<>()).add(new Tuple<>(blobNameAndMetaId.v2(),
-                    metadataBlobName));
+            metaDataByBlobName.computeIfAbsent(blobNameAndMetaId.v1(), k -> new ArrayList<>(1))
+                    .add(new Tuple<>(blobNameAndMetaId.v2(), metadataBlobName));
         }
         metaDataByBlobName.entrySet().forEach(entry -> {
             if (entry.getValue().size() > 1) {

Original file line number	Diff line number	Diff line change
`@@ -409,8 +409,8 @@ private DeleteResult cleanUnreferencedEncryptionMetadata(EncryptedBlobContainer`
`409`	`409`	`metadataBlobsToDelete.add(blobNameAndMetaId.v1());`
`410`	`410`	`}`
`411`	`411`	`// group metadata blobs by their associated blob name`
`412`		`- metaDataByBlobName.putIfAbsent(blobNameAndMetaId.v1(), new ArrayList<>()).add(new Tuple<>(blobNameAndMetaId.v2(),`
`413`		`- metadataBlobName));`
	`412`	`+ metaDataByBlobName.computeIfAbsent(blobNameAndMetaId.v1(), k -> new ArrayList<>(1))`
	`413`	`+ .add(new Tuple<>(blobNameAndMetaId.v2(), metadataBlobName));`
`414`	`414`	`}`
`415`	`415`	`metaDataByBlobName.entrySet().forEach(entry -> {`
`416`	`416`	`if (entry.getValue().size() > 1) {`