LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix for Workflows. Reverted an earlier change which caused an NPE in other classes 

git-svn-id: https://svn.libreccm.org/ccm/trunk@4473 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2016-12-14 10:32:39 +00:00
parent e9ab7077d9
commit 31376f323d
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ccm-core/src/com/arsdigita/workflow/simple/Task.java
View File

@ -325,19 +325,19 @@ public class Task extends AuditedACSObject implements Cloneable {
**/
public Workflow getWorkflow() {
BigDecimal workflowID = getParentID();
// if (workflowID != null) {
// try {
// return (Workflow) DomainObjectFactory.newInstance(new OID
// (Workflow.BASE_DATA_OBJECT_TYPE, workflowID));
// } catch (DataObjectNotFoundException de) {
// throw new UncheckedWrapperException("Could not load Workflow with ID " +
// workflowID, de);
// }
// } else {
// return null;
// }
if (workflowID != null) {
try {
return (Workflow) DomainObjectFactory.newInstance(new OID
(Workflow.BASE_DATA_OBJECT_TYPE, workflowID));
} catch (DataObjectNotFoundException de) {
throw new UncheckedWrapperException("Could not load Workflow with ID " +
workflowID, de);
}
} else {
return null;
}
return Workflow.getObjectWorkflow(workflowID);
// return Workflow.getObjectWorkflow(workflowID);
}