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

…instance in EventBusOptions. (SeleniumHQ#8817)
rafaelfranca · Oct 26, 2020 · bc89931 · bc89931
1 parent 8580ae1
commit bc89931
Showing 1 changed file with 7 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,18 @@ 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) {
+          localBus = createBus();
+          bus = localBus;
         }
       }
     }
 
-    return bus;
+    return localBus;
   }
 
   private EventBus createBus() {