Merge remote-tracking branch 'origin/candidate-8.10.x' into candidate…

…-8.12.x Signed-off-by: Gavin Halliday <[email protected]> # Conflicts: # helm/hpcc/Chart.yaml # helm/hpcc/templates/_helpers.tpl # helm/hpcc/templates/dafilesrv.yaml # helm/hpcc/templates/dali.yaml # helm/hpcc/templates/dfuserver.yaml # helm/hpcc/templates/eclagent.yaml # helm/hpcc/templates/eclccserver.yaml # helm/hpcc/templates/eclscheduler.yaml # helm/hpcc/templates/esp.yaml # helm/hpcc/templates/localroxie.yaml # helm/hpcc/templates/roxie.yaml # helm/hpcc/templates/sasha.yaml # helm/hpcc/templates/thor.yaml # version.cmake
hpcc-systems · Nov 22, 2023 · 30b0d32 · 30b0d32
2 parents 607df4e + db10f48
commit 30b0d32
Showing 1 changed file with 12 additions and 20 deletions.
diff --git a/esp/services/ws_workunits/ws_workunitsService.cpp b/esp/services/ws_workunits/ws_workunitsService.cpp
@@ -3626,6 +3626,16 @@ void getScheduledWUs(IEspContext &context, WUShowScheduledFilters *filters, cons
                             {
                                 jobName.set(cw->queryJobName());
                                 owner.set(cw->queryUser());
+                                if ((cw->getState() == WUStateScheduled) && cw->aborting())
+                                {
+                                    stateID = WUStateAborting;
+                                    state.set("aborting");
+                                }
+                                else
+                                {
+                                    stateID = cw->getState();
+                                    state.set(cw->queryStateDesc());
+                                }
                             }
 
                             if (!filters->jobName.isEmpty() && (jobName.isEmpty() || !WildMatch(jobName.str(), filters->jobName, true)))
@@ -3634,26 +3644,8 @@ void getScheduledWUs(IEspContext &context, WUShowScheduledFilters *filters, cons
                                 match =  false;
                             else if (!filters->eventText.isEmpty() && (ieventText.isEmpty() || !WildMatch(ieventText, filters->eventText, true)))
                                 match =  false;
-                            else if (!filters->state.isEmpty())
-                            {
-                                if (!cw)
-                                    match =  false;
-                                else
-                                {
-                                    if ((cw->getState() == WUStateScheduled) && cw->aborting())
-                                    {
-                                        stateID = WUStateAborting;
-                                        state.set("aborting");
-                                    }
-                                    else
-                                    {
-                                        stateID = cw->getState();
-                                        state.set(cw->queryStateDesc());
-                                    }
-                                    if (!strieq(filters->state, state.str()))
-                                        match =  false;
-                                }
-                            }
+                            else if (!filters->state.isEmpty() && !strisame(filters->state, state.str()))
+                                match =  false;
                         }
                         catch (IException *e)
                         {