Fix misleading node ID startup message (MID-6176)

Evolveum · Apr 14, 2020 · 12c3c9f · 12c3c9f
1 parent d7574bf
commit 12c3c9f
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/.../task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/NodeIdComputer.java b/.../task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/NodeIdComputer.java
@@ -67,7 +67,13 @@ String determineNodeId(Configuration root, boolean clustered, OperationResult re
             }
         }
 
-        String nodeId = getNodeIdFromExpression(root.getInterpolator(), nodeIdExpression, result);
+        String nodeId;
+        if (nodeIdExpression != null) {
+            nodeId = getNodeIdFromExpression(root.getInterpolator(), nodeIdExpression, result);
+        } else {
+            nodeId = null;
+        }
+
         if (StringUtils.isNotEmpty(nodeId)) {
             if (nodeId.equals(nodeIdExpression)) {
                 LOGGER.info("Using configured node ID '{}'", nodeId);