[event-bus] Fix the double check for lazy initialisation of EventBus …

…instance in EventBusOptions.
SeleniumHQ · Oct 23, 2020 · 40a6aa8 · 40a6aa8
1 parent 7f376a6
commit 40a6aa8
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/java/server/src/org/openqa/selenium/grid/server/EventBusOptions.java b/java/server/src/org/openqa/selenium/grid/server/EventBusOptions.java
@@ -33,15 +33,17 @@ public EventBusOptions(Config config) {
   }
 
   public EventBus getEventBus() {
-    if (bus == null) {
+    EventBus localBus = bus;
+    if (localBus == null) {
       synchronized (this) {
-        if (bus == null) {
-          bus = createBus();
+        localBus = bus;
+        if (localBus == null) {
+          bus = localBus = createBus();
         }
       }
     }
 
-    return bus;
+    return localBus;
   }
 
   private EventBus createBus() {