Skip to content
This repository was archived by the owner on Apr 2, 2026. It is now read-only.

replace HashMap with ConcurrentHashMap to avoid ConcurrentModificatio… #883

Merged
BenWhitehead merged 2 commits into from
Apr 11, 2022
Merged

replace HashMap with ConcurrentHashMap to avoid ConcurrentModificatio… #883

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4ad799
replace HashMap with ConcurrentHashMap to avoid ConcurrentModificatio…
oshai Apr 10, 2022
2d0951a
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Apr 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions ...-cloud-nio/src/main/java/com/google/cloud/storage/contrib/nio/testing/FakeStorageRpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import javax.annotation.concurrent.NotThreadSafe;

/**
Expand Down Expand Up @@ -77,11 +77,11 @@ class FakeStorageRpc extends StorageRpcTestBase {
new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");

// fullname -> metadata
Map<String, StorageObject> metadata = new HashMap<>();
Map<String, StorageObject> metadata = new ConcurrentHashMap<>();
// fullname -> contents
Map<String, byte[]> contents = new HashMap<>();
Map<String, byte[]> contents = new ConcurrentHashMap<>();
// fullname -> future contents that will be visible on close.
Map<String, byte[]> futureContents = new HashMap<>();
Map<String, byte[]> futureContents = new ConcurrentHashMap<>();

private final boolean throwIfOption;

Expand All @@ -92,8 +92,8 @@ public FakeStorageRpc(boolean throwIfOption) {

// remove all files
void reset() {
metadata = new HashMap<>();
contents = new HashMap<>();
metadata = new ConcurrentHashMap<>();
contents = new ConcurrentHashMap<>();
}

@Override
Expand Down Expand Up @@ -149,7 +149,7 @@ public Tuple<String, Iterable<StorageObject>> list(String bucket, Map<Option, ?>
final String prefix = preprefix;

List<StorageObject> values = new ArrayList<>();
Map<String, StorageObject> folders = new HashMap<>();
Map<String, StorageObject> folders = new ConcurrentHashMap<>();
for (StorageObject so : metadata.values()) {
if (!so.getBucket().equals(bucket) || !so.getName().startsWith(prefix)) {
continue;
Expand Down