BZ-991475: fix for wrong potential owners and groups in process defin…

…itions information
kiegroup · Aug 27, 2013 · 56dec34 · 56dec34
1 parent 333ab89
commit 56dec34
Showing 1 changed file with 22 additions and 5 deletions.
diff --git a/...rvices/src/main/java/org/jbpm/kie/services/impl/bpmn2/HumanTaskGetInformationHandler.java b/...rvices/src/main/java/org/jbpm/kie/services/impl/bpmn2/HumanTaskGetInformationHandler.java
@@ -107,8 +107,17 @@ protected void handleNode(final org.jbpm.workflow.core.Node node, final Element
         String mainProcessId = repositoryHelper.getProcess().getId();
         for(String parameter : parameters.keySet()){
             if(parameter.equals("GroupId")){
-               repository.getProcessDesc(mainProcessId).getTaskAssignments().put(humanTaskNode.getName(),
-                                     humanTaskNode.getWork().getParameter(parameter).toString());     
+               String currentAssignment = "";
+               if(repository.getProcessDesc(mainProcessId).getTaskAssignments().get(humanTaskNode.getName()) != null){
+                   currentAssignment = repository.getProcessDesc(mainProcessId).getTaskAssignments().get(humanTaskNode.getName());
+               } 
+               if(!currentAssignment.equals("")){
+                    repository.getProcessDesc(mainProcessId).getTaskAssignments().put(humanTaskNode.getName(),
+                                     humanTaskNode.getWork().getParameter(parameter).toString()+ ","+ currentAssignment);     
+               }else{
+                    repository.getProcessDesc(mainProcessId).getTaskAssignments().put(humanTaskNode.getName(),
+                                     humanTaskNode.getWork().getParameter(parameter).toString());
+               }
             }
         }
 
@@ -117,10 +126,18 @@ protected void handleNode(final org.jbpm.workflow.core.Node node, final Element
 
     @Override
     protected String readPotentialOwner(org.w3c.dom.Node xmlNode, HumanTaskNode humanTaskNode) {
-        String userOrGroup = xmlNode.getFirstChild().getFirstChild().getFirstChild().getTextContent();
+        String user = xmlNode.getFirstChild().getFirstChild().getFirstChild().getTextContent();
         String mainProcessId = repositoryHelper.getProcess().getId();
-        repository.getProcessDesc(mainProcessId).getTaskAssignments().put(humanTaskNode.getName(), userOrGroup);
-        return userOrGroup;
+        String currentAssignment = "";
+        if(repository.getProcessDesc(mainProcessId).getTaskAssignments().get(humanTaskNode.getName()) != null){
+            currentAssignment = repository.getProcessDesc(mainProcessId).getTaskAssignments().get(humanTaskNode.getName());
+        }
+        if(!currentAssignment.equals("")){
+            repository.getProcessDesc(mainProcessId).getTaskAssignments().put(humanTaskNode.getName(), user + ","+currentAssignment);
+        }else{
+            repository.getProcessDesc(mainProcessId).getTaskAssignments().put(humanTaskNode.getName(), user);
+        }
+        return user;
     }