inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V4.1-BUG-FIX to HEAD

Browse Source 
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
This commit is contained in:
Dave Ward
2012-09-13 10:06:19 +00:00
parent ee8081b663
commit 8fcf83e9ad
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/repo/workflow/WorkflowDeployer.java
View File

@@ -291,17 +291,9 @@ public class WorkflowDeployer extends AbstractLifecycleBean
} }
else else
{ {
if (!redeploy && workflowService.isDefinitionDeployed(engineId, workflowResource.getInputStream(), mimetype)) WorkflowDeployment deployment = workflowService.deployDefinition(engineId, workflowResource.getInputStream(),
{ mimetype, workflowResource.getFilename());
if (logger.isDebugEnabled()) logDeployment(location, deployment);
logger.debug("Workflow deployer: Definition '" + location + "' already deployed");
}
else
{
WorkflowDeployment deployment = workflowService.deployDefinition(engineId, workflowResource.getInputStream(),
mimetype, workflowResource.getFilename());
logDeployment(location, deployment);
}
} }
} }
else else