Add null check

tchiotludo · Oct 6, 2022 · 9cdd10a · 9cdd10a
1 parent dd7763b
commit 9cdd10a
Showing 1 changed file with 4 additions and 1 deletion.
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());
+        Optional.ofNullable(result.controller().get()).ifPresentOrElse(
+            node -> this.controller = new Node(node),
+            () -> this.controller = new Node());
     }
 }