honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[TEST] Fix NullPointerException in AzureStorageServiceMock 

Makes the code safe against concurrent modifications of the underlying hashmap.
This commit is contained in:
Yannick Welsch 2016-10-31 16:18:58 +01:00
parent 6a8bad8a06
commit a23ded6a94
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/repository-azure/src/test/java/org/elasticsearch/cloud/azure/storage/AzureStorageServiceMock.java
View File

@ -43,7 +43,7 @@ import java.util.concurrent.ConcurrentHashMap;
*/
public class AzureStorageServiceMock extends AbstractComponent implements AzureStorageService {
protected Map<String, ByteArrayOutputStream> blobs = new ConcurrentHashMap<>();
protected final Map<String, ByteArrayOutputStream> blobs = new ConcurrentHashMap<>();
public AzureStorageServiceMock() {
super(Settings.EMPTY);
@ -94,7 +94,7 @@ public class AzureStorageServiceMock extends AbstractComponent implements AzureS
@Override
public Map<String, BlobMetaData> listBlobsByPrefix(String account, LocationMode mode, String container, String keyPath, String prefix) {
MapBuilder<String, BlobMetaData> blobsBuilder = MapBuilder.newMapBuilder();
for (String blobName : blobs.keySet()) {
blobs.forEach((String blobName, ByteArrayOutputStream bos) -> {
final String checkBlob;
if (keyPath != null && !keyPath.isEmpty()) {
// strip off key path from the beginning of the blob name
@ -103,9 +103,9 @@ public class AzureStorageServiceMock extends AbstractComponent implements AzureS
checkBlob = blobName;
}
if (prefix == null || startsWithIgnoreCase(checkBlob, prefix)) {
blobsBuilder.put(blobName, new PlainBlobMetaData(checkBlob, blobs.get(blobName).size()));
blobsBuilder.put(blobName, new PlainBlobMetaData(checkBlob, bos.size()));
}
}
});
return blobsBuilder.immutableMap();
}