Review

amarziali · amarziali · commit da823f86dd48 · 2025-08-12T14:53:34.000+02:00
(cherry picked from commit 67ccb2e)
diff --git a/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java b/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java
@@ -142,7 +142,7 @@ public DDAgentFeaturesDiscovery featuresDiscovery(Config config) {
     DDAgentFeaturesDiscovery ret = featuresDiscovery;
     if (ret == null) {
       synchronized (this) {
-        if (featuresDiscovery == null) {
+        if ((ret = featuresDiscovery) == null) {
           createRemaining(config);
           ret =
               new DDAgentFeaturesDiscovery(
@@ -163,8 +163,6 @@ public DDAgentFeaturesDiscovery featuresDiscovery(Config config) {
             }
           }
           featuresDiscovery = ret;
-        } else {
-          return featuresDiscovery;
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public DDAgentFeaturesDiscovery featuresDiscovery(Config config) {`
`142`	`142`	`DDAgentFeaturesDiscovery ret = featuresDiscovery;`
`143`	`143`	`if (ret == null) {`
`144`	`144`	`synchronized (this) {`
`145`		`- if (featuresDiscovery == null) {`
	`145`	`+ if ((ret = featuresDiscovery) == null) {`
`146`	`146`	`createRemaining(config);`
`147`	`147`	`ret =`
`148`	`148`	`new DDAgentFeaturesDiscovery(`
`@@ -163,8 +163,6 @@ public DDAgentFeaturesDiscovery featuresDiscovery(Config config) {`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`	`featuresDiscovery = ret;`
`166`		`- } else {`
`167`		`- return featuresDiscovery;`
`168`	`166`	`}`
`169`	`167`	`}`
`170`	`168`	`}`