SeleniumHQ
diff --git a/‎java/server/src/org/openqa/selenium/grid/server/EventBusOptions.java‎
Lines changed: 7 additions & 4 deletions b/‎java/server/src/org/openqa/selenium/grid/server/EventBusOptions.java‎
Lines changed: 7 additions & 4 deletions
@@ -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() {
Original file line number	Diff line number	Diff line change
`@@ -33,15 +33,18 @@ public EventBusOptions(Config config) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public EventBus getEventBus() {`
`36`		`- if (bus == null) {`
	`36`	`+ EventBus localBus = bus;`
	`37`	`+ if (localBus == null) {`
`37`	`38`	`synchronized (this) {`
`38`		`- if (bus == null) {`
`39`		`- bus = createBus();`
	`39`	`+ localBus = bus;`
	`40`	`+ if (localBus == null) {`
	`41`	`+ localBus = createBus();`
	`42`	`+ bus = localBus;`
`40`	`43`	`}`
`41`	`44`	`}`
`42`	`45`	`}`
`43`	`46`
`44`		`- return bus;`
	`47`	`+ return localBus;`
`45`	`48`	`}`
`46`	`49`
`47`	`50`	`private EventBus createBus() {`