From 8c3ecb49e1ff57dfa3d0d8dea7bc051d25c2948b Mon Sep 17 00:00:00 2001 From: tosmers Date: Mon, 24 Oct 2016 17:10:30 +0000 Subject: [PATCH] [UPDATE] - solves some Exceptions for the export routine git-svn-id: https://svn.libreccm.org/ccm/trunk@4402 8810af33-2d31-482b-a856-94f89814c4df --- .../arsdigita/categorization/Category.java | 1 - .../com/arsdigita/workflow/simple/Task.java | 25 ++++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ccm-core/src/com/arsdigita/categorization/Category.java b/ccm-core/src/com/arsdigita/categorization/Category.java index b7cfa8d22..c9514ae62 100755 --- a/ccm-core/src/com/arsdigita/categorization/Category.java +++ b/ccm-core/src/com/arsdigita/categorization/Category.java @@ -608,7 +608,6 @@ public class Category extends ACSObject { * @return the category description. */ public String getDescription(String locale) { - // Test for localized version // HACK if (locale != null && !locale.isEmpty() && m_categoryLocalizationCollection != null diff --git a/ccm-core/src/com/arsdigita/workflow/simple/Task.java b/ccm-core/src/com/arsdigita/workflow/simple/Task.java index 63d73377a..a59326390 100755 --- a/ccm-core/src/com/arsdigita/workflow/simple/Task.java +++ b/ccm-core/src/com/arsdigita/workflow/simple/Task.java @@ -325,18 +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); }