BZ-1069747: returning empty for null variables to not break forms

Author: salaboy

jbpm-human-task/jbpm-human-task-core/src/main/java/org/jbpm/services/task/impl/TaskContentServiceImpl.java

@@ -54,8 +54,9 @@ public long addContent(long taskId, Map<String, Object> params) {
         Content outputContent = persistenceContext.findContent(outputContentId);
 
         long contentId = -1;
-        if (outputContent == null) {
-            ContentData outputContentData = ContentMarshallerHelper.marshal(params, null);
+        if (outputContent == null) { 
+            ContentMarshallerContext context = getMarshallerContext(task);
+            ContentData outputContentData = ContentMarshallerHelper.marshal(params, context.getEnvironment());
             Content content = TaskModelProvider.getFactory().newContent();
             ((InternalContent) content).setContent(outputContentData.getContent());
             persistenceContext.persistContent(content);

jbpm-services/jbpm-kie-services/src/main/java/org/jbpm/kie/services/impl/form/FormProviderServiceImpl.java

@@ -76,7 +76,6 @@ public int compare(FormProvider o1, FormProvider o2) {
         }
     }
 
-
     @Override
     public String getFormDisplayProcess(String deploymentId, String processId) {
         ProcessAssetDesc processDesc = dataService.getProcessesByDeploymentIdProcessId(deploymentId, processId);
@@ -93,7 +92,9 @@ public String getFormDisplayProcess(String deploymentId, String processId) {
 
         for (FormProvider provider : providers) {
             String template = provider.render(processDesc.getName(), processDesc, renderContext);
-            if (!StringUtils.isEmpty(template)) return template;
+            if (!StringUtils.isEmpty(template)) {
+                return template;
+            }
         }
 
         logger.warn("Unable to find form to render for process '{}'", processDesc.getName());
@@ -105,7 +106,7 @@ public String getFormDisplayProcess(String deploymentId, String processId) {
     public String getFormDisplayTask(long taskId) {
         Task task = taskService.getTaskById(taskId);
         if (task == null) {
-        	return "";
+            return "";
         }
         String name = task.getNames().get(0).getText();
         ProcessAssetDesc processDesc = dataService.getProcessesByDeploymentIdProcessId(task.getTaskData().getDeploymentId(), task.getTaskData().getProcessId());
@@ -152,38 +153,44 @@ public String getFormDisplayTask(long taskId) {
 
             Object value = ((Map<String, Object>) output).get(key);
             if (value == null) {
-                // WM value = "";
+                value = "";
             }
             finalOutput.put(key, value);
         }
 
 
         // merge template with process variables        
         renderContext.put("task", task);
-        renderContext.put("outputs", finalOutput);
         renderContext.put("marshallerContext", marshallerContext);
 
         // add all inputs as direct entries
         if (input instanceof Map) {
             renderContext.put("inputs", input);
-            for (Map.Entry<String, Object> inputVar : ((Map<String, Object>)input).entrySet()) {
+            for (Map.Entry<String, Object> inputVar : ((Map<String, Object>) input).entrySet()) {
                 renderContext.put(inputVar.getKey(), inputVar.getValue());
             }
         } else {
             renderContext.put("input", input);
         }
 
+        // add all outputs as direct entries
+        renderContext.put("outputs", finalOutput);
+        for (Map.Entry<String, Object> outputVar : ((Map<String, Object>) finalOutput).entrySet()) {
+            renderContext.put(outputVar.getKey(), outputVar.getValue());
+        }
+
         // find form
         for (FormProvider provider : providers) {
             String template = provider.render(name, task, processDesc, renderContext);
-            if (!StringUtils.isEmpty(template)) return template;
+            if (!StringUtils.isEmpty(template)) {
+                return template;
+            }
         }
 
         logger.warn("Unable to find form to render for task '{}' on process '{}'", name, processDesc.getName());
         return "";
     }
 
-    
     protected ContentMarshallerContext getMarshallerContext(String deploymentId, String processId) {
         DeployedUnit deployedUnit = deploymentService.getDeployedUnit(deploymentId);
         if (deployedUnit == null) {
@@ -192,13 +199,13 @@ protected ContentMarshallerContext getMarshallerContext(String deploymentId, Str
         InternalRuntimeManager manager = (InternalRuntimeManager) deployedUnit.getRuntimeManager();
         return new ContentMarshallerContext(manager.getEnvironment().getEnvironment(), manager.getEnvironment().getClassLoader());
     }
-    
+
     protected ContentMarshallerContext getMarshallerContext(Task task) {
-                
+
         if (task == null) {
             return new ContentMarshallerContext();
         }
-        
+
         return TaskContentRegistry.get().getMarshallerContext(task);
     }
 }

jbpm-services/jbpm-kie-services/src/main/java/org/jbpm/kie/services/impl/form/provider/FreemakerFormProvider.java

@@ -13,7 +13,7 @@
 public abstract class FreemakerFormProvider implements FormProvider {
 
     protected String render(String name, InputStream src, Map<String, Object> renderContext) {
-
+        
         String str = null;
         try {
             freemarker.template.Configuration cfg = new freemarker.template.Configuration();