Handle missing role.

dataquest-dev · Aug 8, 2023 · 2e62fa3 · 2e62fa3
1 parent be22790
commit 2e62fa3
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/curate/XmlWorkflowCuratorServiceImpl.java b/dspace-api/src/main/java/org/dspace/curate/XmlWorkflowCuratorServiceImpl.java
@@ -31,6 +31,7 @@
 import org.dspace.workflow.FlowStep;
 import org.dspace.workflow.Task;
 import org.dspace.workflow.TaskSet;
+import org.dspace.xmlworkflow.Role;
 import org.dspace.xmlworkflow.RoleMembers;
 import org.dspace.xmlworkflow.WorkflowConfigurationException;
 import org.dspace.xmlworkflow.factory.XmlWorkflowFactory;
@@ -276,12 +277,17 @@ protected List<EPerson> resolveContacts(Context c, List<String> contacts,
                             String.valueOf(wfi.getID()), e);
                     return epList;
                 }
-                RoleMembers roleMembers = step.getRole().getMembers(c, wfi);
-                for (EPerson ep : roleMembers.getEPersons()) {
-                    epList.add(ep);
-                }
-                for (Group group : roleMembers.getGroups()) {
-                    epList.addAll(group.getMembers());
+                Role role = step.getRole();
+                if (null != role) {
+                    RoleMembers roleMembers = role.getMembers(c, wfi);
+                    for (EPerson ep : roleMembers.getEPersons()) {
+                        epList.add(ep);
+                    }
+                    for (Group group : roleMembers.getGroups()) {
+                        epList.addAll(group.getMembers());
+                    }
+                } else {
+                    epList.add(ePersonService.getSystemEPerson(c));
                 }
             } else if ("$colladmin".equals(contact)) {
                 // special literal for collection administrators