From f7b7a8c2bd39581e0e6475fbdc754a61f688f232 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 25 Feb 2015 13:30:50 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 98009: Merged DEV (5.0.0.BF) to HEAD-BUG-FIX (5.1/Cloud) 75872: ACE-1408 : Oracle: JBPMWorkflowRestApiTest testTaskInstancePut always fails Fixed hiddenTransitions property handling on case of Oracle. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@98018 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/web/scripts/workflow/WorkflowModelBuilder.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java index 31114c6c95..cafe658e74 100644 --- a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java +++ b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2011 Alfresco Software Limited. + * Copyright (C) 2005-2014 Alfresco Software Limited. * * This file is part of Alfresco * @@ -630,6 +630,10 @@ public class WorkflowModelBuilder return Arrays.asList(hiddenStr.split(",")); } } + else if (hiddenSer == null) + { + return Collections.emptyList(); + } return null; }