Skip to content

Commit 79fb99e

Browse files
authored
Hotfix for race condition during EventBus creation (#88)
1 parent 184c091 commit 79fb99e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/main/java/net/minecraftforge/eventbus/internal/BusGroupImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ public <T extends Event> EventBus<T> getOrCreateEventBus(Class<T> eventType) {
132132
var computedEventBus = createEventBus(eventType);
133133

134134
synchronized (eventBuses) {
135-
eventBuses.putIfAbsent(eventType, computedEventBus);
136-
return computedEventBus;
135+
var existing = eventBuses.putIfAbsent(eventType, computedEventBus);
136+
return existing == null ? computedEventBus : (EventBus<T>) existing;
137137
}
138138
}
139139
//endregion

0 commit comments

Comments
 (0)