From b652eb89c56a10427bb707fa4f617602c7b730f0 Mon Sep 17 00:00:00 2001 From: Neil McErlean Date: Tue, 14 Oct 2014 13:34:44 +0000 Subject: [PATCH] Removing the possibility of a NPE in WorkflowService when run with trace logging. (Findbugs) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@88051 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/workflow/WorkflowServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java b/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java index f5b95261ae..84d6f9ba63 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowServiceImpl.java @@ -622,7 +622,12 @@ public class WorkflowServiceImpl implements WorkflowService */ public List cancelWorkflows(List workflowIds) { - if (logger.isTraceEnabled()) { logger.trace("Cancelling " + (workflowIds == null ? 0 : workflowIds.size()) + " workflowIds..."); } + if (workflowIds == null) + { + workflowIds = Collections.emptyList(); + } + + if (logger.isTraceEnabled()) { logger.trace("Cancelling " + workflowIds.size() + " workflowIds..."); } List result = new ArrayList(workflowIds.size());