Avoid race conditions

manuel-alvarez-alvarez · manuel-alvarez-alvarez · commit 47af939ee7f1 · 2025-01-16T15:02:02.000+01:00
diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/AppSecSystem.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/AppSecSystem.java
@@ -129,9 +129,12 @@ public static void stop() {
       return;
     }
     REPLACEABLE_EVENT_PRODUCER = null;
-    STOP_SUBSCRIPTION_SERVICE.run();
-    STOP_SUBSCRIPTION_SERVICE = null;
-    RESET_SUBSCRIPTION_SERVICE = null;
+    final Runnable stop = STOP_SUBSCRIPTION_SERVICE;
+    if (stop != null) {
+      stop.run();
+      STOP_SUBSCRIPTION_SERVICE = null;
+      RESET_SUBSCRIPTION_SERVICE = null;
+    }
     Blocking.setBlockingService(BlockingService.NOOP);
 
     APP_SEC_CONFIG_SERVICE.close();
@@ -180,8 +183,9 @@ private static void reloadSubscriptions(
 
     replaceableEventProducerService.replaceEventProducerService(newEd);
 
-    if (RESET_SUBSCRIPTION_SERVICE != null) {
-      RESET_SUBSCRIPTION_SERVICE.run();
+    final Runnable reset = RESET_SUBSCRIPTION_SERVICE;
+    if (reset != null) {
+      reset.run();
     }
   }
 
