refactor: define the conditional tenant configuration more explicit

camunda-community-hub · Nov 29, 2024 · 512d3a5 · 512d3a5
1 parent 6ea8110
commit 512d3a5
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/spring-boot/src/main/java/io/vanillabp/camunda8/wiring/Camunda8TaskWiring.java b/spring-boot/src/main/java/io/vanillabp/camunda8/wiring/Camunda8TaskWiring.java
@@ -114,9 +114,14 @@ public void openWorkers() {
                             .handler(userTaskHandler)
                             .timeout(Integer.MAX_VALUE) // user-tasks are not fetched more than once
                             .name(workerId);
+
+                    if (tenantId != null) {
+                        userTaskWorker.tenantId(tenantId);
+                    }
+
                     final var workerProperties = camunda8Properties.getUserTaskWorkerProperties(workflowModuleId);
                     workerProperties.applyToUserTaskWorker(userTaskWorker);
-                    return tenantId != null ? userTaskWorker.tenantId(tenantId) : userTaskWorker;
+                    return userTaskWorker;
                 })
                 .forEach(workers::add);