fix(node): fix nullpointer when trying to view cluster information in…

… MSK Serverless (#1227) close #1226 Co-authored-by: Ludovic DEHON <tchiot.ludo@gmail.com>
tchiotludo · Nov 6, 2022 · bb6a35e · bb6a35e
1 parent 9325de2
commit bb6a35e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/client/src/containers/Node/NodeList/NodesList.jsx b/client/src/containers/Node/NodeList/NodesList.jsx
@@ -37,7 +37,7 @@ class NodesList extends Root {
         id: JSON.stringify(node.id) || '',
         host: `${node.host}:${node.port}` || '',
         rack: node.rack || '',
-        controller: nodes.controller.id === node.id ? 'True' : 'False' || '',
+        controller: nodes.controller && nodes.controller.id === node.id ? 'True' : 'False' || '',
         partition: undefined
       };
     });

diff --git a/src/main/java/org/akhq/models/Cluster.java b/src/main/java/org/akhq/models/Cluster.java
@@ -8,6 +8,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 
 @ToString
@@ -25,6 +26,8 @@ public Cluster(DescribeClusterResult result) throws ExecutionException, Interrup
             this.nodes.add(new Node(node));
         }
 
-        this.controller = new Node(result.controller().get());
+        if (result.controller().get() != null) {
+            this.controller = new Node(result.controller().get());
+        }
     }
 }