From 12c3c9f3d1b20aa8e26d2309ef3fb4313595a604 Mon Sep 17 00:00:00 2001
From: Pavol Mederly <mederly@evolveum.com>
Date: Tue, 14 Apr 2020 10:22:22 +0200
Subject: [PATCH] Fix misleading node ID startup message (MID-6176)

---
 .../evolveum/midpoint/task/quartzimpl/NodeIdComputer.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/NodeIdComputer.java b/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/NodeIdComputer.java
index bb6d49363e4..ee645d097f9 100644
--- a/repo/task-quartz-impl/src/main/java/com/evolveum/midpoint/task/quartzimpl/NodeIdComputer.java
+++ b/repo/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);