Skip to content

Fix race condition in CardEdition.getCardInSet() #9542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hanmac merged 3 commits into from
Jan 19, 2026
Merged

Fix race condition in CardEdition.getCardInSet() #9542

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05b9863
CardEdition: cleanup Constructor
Hanmac Jan 19, 2026
f75d8c2
Fix race condition in CardEdition.getCardInSet()
fediazgon Jan 16, 2026
cc3fb8f
Merge branch 'master' into fix/race-condition-getCardInSet
tool4ever Jan 19, 2026
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
23 changes: 10 additions & 13 deletions forge-core/src/main/java/forge/card/CardEdition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,13 @@ private CardEdition(ListMultimap<String, EditionEntry> cardMap, ListMultimap<Str
this.cardMap = cardMap;
this.cardsInSet = new ArrayList<>(cardMap.values());
Collections.sort(cardsInSet);
this.cardsInSetLookupMap = cardsInSet.stream().collect(
Multimaps.toMultimap(
e -> e.name,
e -> e,
MultimapBuilder.treeKeys(String.CASE_INSENSITIVE_ORDER).arrayListValues()::build
)
);
this.tokenMap = tokens;
this.customPrintSheetsToParse = customPrintSheetsToParse;
}
Expand All @@ -343,7 +350,6 @@ private CardEdition(ListMultimap<String, EditionEntry> cardMap, ListMultimap<Str
* it uses the 3-letter codes for the folder no matter the age of the set.
* @param type the set type
* @param name the name of the set
* @param cards the cards in the set
*/
private CardEdition(String date, String code, String code2, Type type, String name, FoilType foil) {
this(ArrayListMultimap.create(), ArrayListMultimap.create(), new HashMap<>());
Expand Down Expand Up @@ -409,25 +415,16 @@ public List<EditionEntry> getAllCardsInSet() {
return cardsInSet;
}

private ListMultimap<String, EditionEntry> cardsInSetLookupMap = null;
private final ListMultimap<String, EditionEntry> cardsInSetLookupMap;

/**
* Get all the CardInSet instances with the input card name.
* @param cardName Name of the Card to look for.
* @return A List of all the CardInSet instances for a given name.
* If not found, an Empty sequence (view) will be returned instead!
*/
public List<EditionEntry> getCardInSet(String cardName){
if (cardsInSetLookupMap == null) {
// initialise
cardsInSetLookupMap = Multimaps.newListMultimap(new TreeMap<>(String.CASE_INSENSITIVE_ORDER), Lists::newArrayList);
List<EditionEntry> cardsInSet = this.getAllCardsInSet();
for (EditionEntry cis : cardsInSet){
String key = cis.name;
cardsInSetLookupMap.put(key, cis);
}
}
return this.cardsInSetLookupMap.get(cardName);
public List<EditionEntry> getCardInSet(String cardName) {
return cardsInSetLookupMap.get(cardName);
}

public EditionEntry getCardFromCollectorNumber(String collectorNumber) {
Expand Down