From 5c4a3840f1ca2d18a7636ea422ef7464cd511d3d Mon Sep 17 00:00:00 2001
From: Andrea Marziali <andrea.marziali@datadoghq.com>
Date: Tue, 12 Aug 2025 13:56:01 +0200
Subject: [PATCH 1/2] Avoid NPE on featureDiscovery creation

(cherry picked from commit cf7d5bbc11c14c4c100edb0b8c89f89520723403)
---
 .../communication/ddagent/SharedCommunicationObjects.java       | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java b/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java
index b855731bc08..c6bece119d8 100644
--- a/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java
+++ b/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java
@@ -163,6 +163,8 @@ public DDAgentFeaturesDiscovery featuresDiscovery(Config config) {
             }
           }
           featuresDiscovery = ret;
+        } else {
+          return featuresDiscovery;
         }
       }
     }

From da823f86dd489659147c58412b257aaa92b4ead3 Mon Sep 17 00:00:00 2001
From: Andrea Marziali <andrea.marziali@datadoghq.com>
Date: Tue, 12 Aug 2025 14:06:18 +0200
Subject: [PATCH 2/2] Review

(cherry picked from commit 67ccb2e820991748672dcea2316e4c8d4389fe77)
---
 .../communication/ddagent/SharedCommunicationObjects.java     | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java b/communication/src/main/java/datadog/communication/ddagent/SharedCommunicationObjects.java
index c6bece119d8..68c0f287f7e 100644
--- 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;
         }
       }
     }