From dcf3c7417cb374cd955724a3bee2f0b54f368944 Mon Sep 17 00:00:00 2001 From: robvde Date: Sun, 10 Mar 2013 22:56:53 +0400 Subject: [PATCH] Merge Commit Scheduler updated --- .../Code/Scheduling/Scheduler.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Scheduling/Scheduler.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Scheduling/Scheduler.cs index 3d9dc942..268391b7 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Scheduling/Scheduler.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/Scheduling/Scheduler.cs @@ -162,14 +162,13 @@ namespace WebsitePanel.EnterpriseServer counter++; } + + // skip execution if the current task is still running + scheduledTasks = TaskManager.GetScheduledTasks(); + if (!scheduledTasks.ContainsKey(schedule.ScheduleInfo.ScheduleId)) { - // skip execution if the current task is still running - scheduledTasks = TaskManager.GetScheduledTasks(); - if (!scheduledTasks.ContainsKey(schedule.ScheduleInfo.ScheduleId)) - { - // run the schedule in the separate thread - schedule.Run(); - } + // run the schedule in the separate thread + schedule.Run(); } } catch (Exception Ex)