From bdf9a2e0cc683820c6f9d8749106b9dc2d02385c Mon Sep 17 00:00:00 2001
From: Nhat Nguyen <nhat.nguyen@elastic.co>
Date: Mon, 8 Jul 2024 16:34:44 -0700
Subject: [PATCH] Fix BWC for compute listener (#110615)

ComputeResponse from old nodes may have a null value instead of an empty
list for profiles.

Relates #110400 Closes #110591
---
 muted-tests.yml                                              | 2 --
 .../org/elasticsearch/xpack/esql/plugin/ComputeListener.java | 5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/muted-tests.yml b/muted-tests.yml
index dc1ba7b855d83..ccbdb68fbb8c7 100644
--- a/muted-tests.yml
+++ b/muted-tests.yml
@@ -97,8 +97,6 @@ tests:
 - class: "org.elasticsearch.xpack.searchablesnapshots.FrozenSearchableSnapshotsIntegTests"
   issue: "https://github.com/elastic/elasticsearch/issues/110408"
   method: "testCreateAndRestorePartialSearchableSnapshot"
-- class: "org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT"
-  issue: "https://github.com/elastic/elasticsearch/issues/110591"
 
 # Examples:
 #
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/ComputeListener.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/ComputeListener.java
index f8f35bb6f0b4f..01d50d505f7f2 100644
--- a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/ComputeListener.java
+++ b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plugin/ComputeListener.java
@@ -76,8 +76,9 @@ ActionListener<Void> acquireAvoid() {
     ActionListener<ComputeResponse> acquireCompute() {
         return acquireAvoid().map(resp -> {
             responseHeaders.collect();
-            if (resp != null && resp.getProfiles().isEmpty() == false) {
-                collectedProfiles.addAll(resp.getProfiles());
+            var profiles = resp.getProfiles();
+            if (profiles != null && profiles.isEmpty() == false) {
+                collectedProfiles.addAll(profiles);
             }
             return null;
         });