From ffd8ac60d00ab65b8d96d9cde37541e3ab22be13 Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 5 Jul 2022 15:48:53 -0700 Subject: [PATCH] fix tasklist start issue, added UUID --- .../java/jpl/cws/engine/CwsEngineProcessApplication.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cws-engine-service/src/main/java/jpl/cws/engine/CwsEngineProcessApplication.java b/cws-engine-service/src/main/java/jpl/cws/engine/CwsEngineProcessApplication.java index 2dab8c8d..379ce640 100644 --- a/cws-engine-service/src/main/java/jpl/cws/engine/CwsEngineProcessApplication.java +++ b/cws-engine-service/src/main/java/jpl/cws/engine/CwsEngineProcessApplication.java @@ -297,7 +297,7 @@ public void notify(final DelegateExecution execution) throws Exception { "VARIABLE [" + varKey + " = " + variables.get(varKey) + "]"); } } - + // If this is an event in a subprocess, then this doesn't count. // We only want to count events of the parent process. // @@ -321,9 +321,9 @@ public void notify(final DelegateExecution execution) throws Exception { } log.trace("sendProcEventTopicMessageWithRetries"); - String startedOnWorkerId = execution.getVariable("startedOnWorkerId").toString(); - if (startedOnWorkerId != null && !startedOnWorkerId.equals(workerId)) { - log.debug("PROCESS '" + procDefKey + "' - Started on worker[" + startedOnWorkerId + "] != ended[" + workerId + "] on worker"); + if (execution.getVariable("uuid") != null && execution.getVariable("startedOnWorkerId") != null && !execution.getVariable("startedOnWorkerId").toString().equals(workerId)) { + log.debug("PROCESS '" + procDefKey + "' (uuid=" + execution.getVariable("uuid").toString() + ") - Started on worker[" + + execution.getVariable("startedOnWorkerId").toString() + "] != ended[" + workerId + "] on worker"); } // FIXME: UUID might not be right if (execution.getVariable("uuid") != null) {