From 71c0ed10c6b3e46c8d6a9b4e71cd4cd6cf73607d Mon Sep 17 00:00:00 2001
From: David Smiley <dsmiley@salesforce.com>
Date: Sun, 8 Dec 2024 22:51:24 -0500
Subject: [PATCH] move CLIUtils change after the refactor

---
 solr/core/src/java/org/apache/solr/cli/CLIUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solr/core/src/java/org/apache/solr/cli/CLIUtils.java b/solr/core/src/java/org/apache/solr/cli/CLIUtils.java
index 7f4c0dc648b..b3336eb2361 100644
--- a/solr/core/src/java/org/apache/solr/cli/CLIUtils.java
+++ b/solr/core/src/java/org/apache/solr/cli/CLIUtils.java
@@ -328,7 +328,7 @@ public static boolean safeCheckCoreExists(String solrUrl, String coreName, Strin
         Map<String, Object> failureStatus =
             (Map<String, Object>) existsCheckResult.get("initFailures");
         String errorMsg = (String) failureStatus.get(coreName);
-        final boolean hasName = coreStatus != null && coreStatus.asMap().containsKey(NAME);
+        final boolean hasName = coreStatus != null && coreStatus.get(NAME) != null;
         exists = hasName || errorMsg != null;
         wait = hasName && errorMsg == null && "true".equals(coreStatus.get("isLoading"));
       } while (wait && System.nanoTime() - startWaitAt < MAX_WAIT_FOR_CORE_LOAD_NANOS);