From 6fc140cba35f9c48a45f4d64e7210fb16b8d67cd Mon Sep 17 00:00:00 2001 From: James Shaw Date: Tue, 24 Sep 2024 11:05:41 +0100 Subject: [PATCH] perf: avoid creating unused StepEventBuses (#3544) --- .../main/java/net/thucydides/core/steps/StepEventBus.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/serenity-core/src/main/java/net/thucydides/core/steps/StepEventBus.java b/serenity-core/src/main/java/net/thucydides/core/steps/StepEventBus.java index 40e573a11..ac39958cb 100644 --- a/serenity-core/src/main/java/net/thucydides/core/steps/StepEventBus.java +++ b/serenity-core/src/main/java/net/thucydides/core/steps/StepEventBus.java @@ -107,9 +107,8 @@ public static StepEventBus eventBusFor(Object key) { if (key == null) { return new SilentEventBus(ConfiguredEnvironment.getEnvironmentVariables()); } - STICKY_EVENT_BUSES.putIfAbsent(key, new StepEventBus(ConfiguredEnvironment.getEnvironmentVariables(), - ConfiguredEnvironment.getConfiguration())); - return STICKY_EVENT_BUSES.get(key); + return STICKY_EVENT_BUSES.computeIfAbsent(key, (unused) -> new StepEventBus( + ConfiguredEnvironment.getEnvironmentVariables(), ConfiguredEnvironment.getConfiguration())); } public static void setCurrentBusToEventBusFor(Object key) {