[#3275] Fix NPE on Command Router startup.

Signed-off-by: Carsten Lohmann <[email protected]>
eclipse-hono · May 30, 2022 · 06dcb87 · 06dcb87
1 parent 98d8b1b
commit 06dcb87
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/...main/java/org/eclipse/hono/commandrouter/impl/kafka/InternalKafkaTopicCleanupService.java b/...main/java/org/eclipse/hono/commandrouter/impl/kafka/InternalKafkaTopicCleanupService.java
@@ -79,11 +79,13 @@ public InternalKafkaTopicCleanupService(
         Objects.requireNonNull(adminClientConfigProperties);
 
         final var adminClientConfig = adminClientConfigProperties.getAdminClientConfig(CLIENT_NAME);
-        final var kafkaClientFactory = new KafkaClientFactory(vertx);
-        this.kafkaAdminClientCreator = () -> kafkaClientFactory.createKafkaAdminClientWithRetries(
-                adminClientConfig,
-                lifecycleStatus::isStarting,
-                KafkaClientFactory.UNLIMITED_RETRIES_DURATION);
+        this.kafkaAdminClientCreator = () -> {
+            final var kafkaClientFactory = new KafkaClientFactory(vertx);
+            return kafkaClientFactory.createKafkaAdminClientWithRetries(
+                    adminClientConfig,
+                    lifecycleStatus::isStarting,
+                    KafkaClientFactory.UNLIMITED_RETRIES_DURATION);
+        };
     }
 
     /**