[java] Fixing double-check lock in a lazy initializer

SeleniumHQ · Nov 10, 2020 · d97844c · d97844c
1 parent 6e8bdcc
commit d97844c
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/java/server/src/org/openqa/selenium/grid/log/LoggingOptions.java b/java/server/src/org/openqa/selenium/grid/log/LoggingOptions.java
@@ -99,16 +99,17 @@ public Tracer getTracer() {
 
     LOG.info("Using OpenTelemetry for tracing");
 
-    if (tracer != null) {
-      return tracer;
-    }
-
-    synchronized (LoggingOptions.class) {
-      if (tracer == null) {
-        tracer = createTracer();
+    Tracer localTracer = tracer;
+    if (localTracer == null) {
+      synchronized (LoggingOptions.class) {
+        localTracer = tracer;
+        if (localTracer == null) {
+          localTracer = createTracer();
+          tracer = localTracer;
+        }
       }
     }
-    return tracer;
+    return localTracer;
   }
 
   private Tracer createTracer() {