From 31376f323da2cd6f4e47dad531945058b507ad28 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 14 Dec 2016 10:32:39 +0000
Subject: [PATCH] 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
---
 .../com/arsdigita/workflow/simple/Task.java   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ccm-core/src/com/arsdigita/workflow/simple/Task.java b/ccm-core/src/com/arsdigita/workflow/simple/Task.java
index a59326390..dc5f210c5 100755
--- a/ccm-core/src/com/arsdigita/workflow/simple/Task.java
+++ b/ccm-core/src/com/arsdigita/workflow/simple/Task.java
@@ -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);
     }