Merge pull request #37 from viadee/develop

#36 fixed bug in activity level history fill step
viadee · Dec 12, 2019 · 2490e04 · 2490e04
2 parents 424ca3e + 87c0c37
commit 2490e04
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/bpmnai-core/pom.xml b/bpmnai-core/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>de.viadee</groupId>
 	<artifactId>bpmnai-core</artifactId>
-	<version>1.2.1</version>
+	<version>1.2.2</version>
 	<packaging>jar</packaging>
 
     <properties>

diff --git a/.../viadee/bpmnai/core/processing/steps/dataprocessing/FillActivityInstancesHistoryStep.java b/.../viadee/bpmnai/core/processing/steps/dataprocessing/FillActivityInstancesHistoryStep.java
@@ -67,8 +67,16 @@ public Dataset<Row> runPreprocessingStep(Dataset<Row> dataset, Map<String, Objec
                 if(Arrays.asList(vars).contains(c)) {
                     //it was a variable
                     if(valuesToWrite.get(c) != null) {
-                        // we already have a value for the current process instance, so we use it
-                        columnValue = valuesToWrite.get(c);
+                        // we already have a value for the current process instance, so we use it if there is no new value provided
+                        String currentValue = row.getAs(c);
+                        if(currentValue != null) {
+                            //new value provided
+                            valuesToWrite.put(c, currentValue);
+                            columnValue = currentValue;
+                        } else {
+                            //null value
+                            columnValue = valuesToWrite.get(c);
+                        }
                     } else {
                         // we don't have a value yet for the current process instance
                         String currentValue = row.getAs(c);