From 58408c3eae3db890c25b2231a35bb69ac5127b45 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 30 Sep 2014 22:28:41 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud) << Fix for ActivitiTimerExecutionTest failure on HEAD taking place 50% of the time in last few days >> 85907: Merged DEV (5.0.0.BF) to HEAD-BUG-FIX (5.0/Cloud) 85758: MNT-12398 : FeedNotifier - Users mixed up, fail to send notification email Changed the timing logic in ActivitiTimerExecutionTest to avoid possible deadlocks. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@86051 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../activiti/ActivitiTimerExecutionTest.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/source/test-java/org/alfresco/repo/workflow/activiti/ActivitiTimerExecutionTest.java b/source/test-java/org/alfresco/repo/workflow/activiti/ActivitiTimerExecutionTest.java index b587583c81..83d3015ded 100644 --- a/source/test-java/org/alfresco/repo/workflow/activiti/ActivitiTimerExecutionTest.java +++ b/source/test-java/org/alfresco/repo/workflow/activiti/ActivitiTimerExecutionTest.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 * @@ -256,23 +256,19 @@ public class ActivitiTimerExecutionTest extends BaseSpringTest { String processInstanceId = BPMEngineRegistry.getLocalId(workflowInstanceId); // Job-executor should finish the job, no timers should be available for WF - List timers = activitiProcessEngine.getManagementService().createJobQuery() - .timers() - .processInstanceId(processInstanceId) - .list(); - + List timers = null; int numberOfRetries = 5; for (int i=0; i< numberOfRetries; i++) { - if (timers.size() == 0) - { - break; - } - Thread.sleep(1000); + Thread.sleep(1500); timers = activitiProcessEngine.getManagementService().createJobQuery() .timers() .processInstanceId(processInstanceId) .list(); + if (timers.size() == 0) + { + break; + } } if(timers.size() > 0) {