Skip to content

Commit 5fccabf

Browse files
committed
8368670: Deadlock in JFR on event register + class load
Reviewed-by: mgronlun
1 parent 1a03a1f commit 5fccabf

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/jdk.jfr/share/classes/jdk/jfr/internal/MetadataRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ private byte[] getBinaryRepresentation() {
291291
}
292292
}
293293

294-
synchronized boolean isEnabled(String eventName) {
294+
boolean isEnabled(String eventName) {
295295
return settingsManager.isEnabled(eventName);
296296
}
297297

src/jdk.jfr/share/classes/jdk/jfr/internal/SettingsManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public void finish() {
129129
}
130130
}
131131

132-
private Map<String, InternalSetting> availableSettings = new LinkedHashMap<>();
132+
private volatile Map<String, InternalSetting> availableSettings = new LinkedHashMap<>();
133133

134134
void setSettings(List<Map<String, String>> activeSettings, boolean writeSettingEvents) {
135135
// store settings so they are available if a new event class is loaded

0 commit comments

Comments
 (0)