From 8fcf83e9adebf69928817cfc4c8bf7300ff66814 Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Thu, 13 Sep 2012 10:06:19 +0000 Subject: [PATCH] Merged V4.1-BUG-FIX to HEAD 41549: (RECORD ONLY) ALF-15908: Ensure custom actions work (latest Surf libs r1140) 41551: Fixed the failing unit test for ALF-15687. 41553: ALF-14201: sorted out sorting issue in historic task query 41554: ALF-15930: Removed redundant duplicate condition checking when deploying a workflow git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@41555 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/repo/workflow/WorkflowDeployer.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/source/java/org/alfresco/repo/workflow/WorkflowDeployer.java b/source/java/org/alfresco/repo/workflow/WorkflowDeployer.java index 30b97b582e..adeae7e2b6 100644 --- a/source/java/org/alfresco/repo/workflow/WorkflowDeployer.java +++ b/source/java/org/alfresco/repo/workflow/WorkflowDeployer.java @@ -291,17 +291,9 @@ public class WorkflowDeployer extends AbstractLifecycleBean } else { - if (!redeploy && workflowService.isDefinitionDeployed(engineId, workflowResource.getInputStream(), mimetype)) - { - if (logger.isDebugEnabled()) - logger.debug("Workflow deployer: Definition '" + location + "' already deployed"); - } - else - { - WorkflowDeployment deployment = workflowService.deployDefinition(engineId, workflowResource.getInputStream(), - mimetype, workflowResource.getFilename()); - logDeployment(location, deployment); - } + WorkflowDeployment deployment = workflowService.deployDefinition(engineId, workflowResource.getInputStream(), + mimetype, workflowResource.getFilename()); + logDeployment(location, deployment); } } else