chore(merge): master into dev

bonitasoft · Nov 19, 2024 · c6b656a · c6b656a
2 parents 4d6da42 + 6c8d70b
commit c6b656a
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/...re/bonita-process-engine/src/main/java/org/bonitasoft/engine/api/impl/ProcessAPIImpl.java b/...re/bonita-process-engine/src/main/java/org/bonitasoft/engine/api/impl/ProcessAPIImpl.java
@@ -3918,22 +3918,26 @@ public Map<String, Map<String, Long>> getFlownodeStateCounters(final long proces
                     .getNumberOfFlownodesInAllStates(
                             processInstanceId);
             for (final SFlowNodeInstanceStateCounter nodeCounter : flownodes) {
-                final String flownodeName = nodeCounter.getFlownodeName();
-                final Map<String, Long> flownodeCounters = getFlowNodeCounters(countersForProcessInstance,
-                        flownodeName);
-                flownodeCounters.put(nodeCounter.getStateName(), nodeCounter.getNumberOf());
-                countersForProcessInstance.put(flownodeName, flownodeCounters);
+                if (nodeCounter.getStateName() != null) {
+                    final String flownodeName = nodeCounter.getFlownodeName();
+                    final Map<String, Long> flownodeCounters = getFlowNodeCounters(countersForProcessInstance,
+                            flownodeName);
+                    flownodeCounters.put(nodeCounter.getStateName(), nodeCounter.getNumberOf());
+                    countersForProcessInstance.put(flownodeName, flownodeCounters);
+                }
             }
             // Archived flownodes:
             final List<SFlowNodeInstanceStateCounter> archivedFlownodes = serviceAccessor.getActivityInstanceService()
                     .getNumberOfArchivedFlownodesInAllStates(
                             processInstanceId);
             for (final SFlowNodeInstanceStateCounter nodeCounter : archivedFlownodes) {
-                final String flownodeName = nodeCounter.getFlownodeName();
-                final Map<String, Long> flownodeCounters = getFlowNodeCounters(countersForProcessInstance,
-                        flownodeName);
-                flownodeCounters.put(nodeCounter.getStateName(), nodeCounter.getNumberOf());
-                countersForProcessInstance.put(flownodeName, flownodeCounters);
+                if (nodeCounter.getStateName() != null) {
+                    final String flownodeName = nodeCounter.getFlownodeName();
+                    final Map<String, Long> flownodeCounters = getFlowNodeCounters(countersForProcessInstance,
+                            flownodeName);
+                    flownodeCounters.put(nodeCounter.getStateName(), nodeCounter.getNumberOf());
+                    countersForProcessInstance.put(flownodeName, flownodeCounters);
+                }
             }
         } catch (final SProcessInstanceNotFoundException e) {
             //cannot throw directly a ProcessInstanceNotFoundException to avoid API break