From b209dd013d0b2e4c3c33e7826f61bd0a1ab9101c Mon Sep 17 00:00:00 2001
From: Justin Bertram <jbertram@apache.org>
Date: Thu, 2 May 2024 09:45:04 -0500
Subject: [PATCH] ARTEMIS-1769 mitigate null

---
 .../activemq/artemis/core/management/impl/view/SessionView.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/SessionView.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/SessionView.java
index 182d84285e..28104c7e82 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/SessionView.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/view/SessionView.java
@@ -47,7 +47,7 @@ public class SessionView extends ActiveMQAbstractView<ServerSession> {
          .add(SessionField.CONSUMER_COUNT.getName(), session.getConsumerCount())
          .add(SessionField.PRODUCER_COUNT.getName(), session.getProducerCount())
          .add(SessionField.CONNECTION_ID.getName(), session.getConnectionID().toString())
-         .add(SessionField.CLIENT_ID.getName(), session.getRemotingConnection().getClientID());
+         .add(SessionField.CLIENT_ID.getName(), session.getRemotingConnection().getClientID() != null ? session.getRemotingConnection().getClientID() : "");
       return obj;
    }