Commit 28d70629 authored by Yaroslav_Shatalov's avatar Yaroslav_Shatalov
Browse files

Merge branch '10.0.X' of https://github.com/ow2-proactive/scheduling into 10.0.X

parents 364dcd6a 2d5d2e8f
......@@ -177,7 +177,7 @@ public class SchedulerFrontend implements InitActive, Scheduler, RunActive {
* Delay to wait for between getting a job result and removing the job
* concerned
*/
private static final long SCHEDULER_REMOVED_JOB_DELAY = PASchedulerProperties.SCHEDULER_REMOVED_JOB_DELAY.getValueAsInt() *
private static final long SCHEDULER_REMOVED_JOB_DELAY = PASchedulerProperties.SCHEDULER_REMOVED_JOB_DELAY.getValueAsLong() *
1000;
private static final Logger logger = Logger.getLogger(SchedulerFrontend.class);
......
......@@ -83,10 +83,10 @@ public class SchedulingService {
static final JobLogger jlogger = JobLogger.getInstance();
static final long SCHEDULER_AUTO_REMOVED_JOB_DELAY = PASchedulerProperties.SCHEDULER_AUTOMATIC_REMOVED_JOB_DELAY.getValueAsInt() *
static final long SCHEDULER_AUTO_REMOVED_JOB_DELAY = PASchedulerProperties.SCHEDULER_AUTOMATIC_REMOVED_JOB_DELAY.getValueAsLong() *
1000;
static final long SCHEDULER_REMOVED_JOB_DELAY = PASchedulerProperties.SCHEDULER_REMOVED_JOB_DELAY.getValueAsInt() *
static final long SCHEDULER_REMOVED_JOB_DELAY = PASchedulerProperties.SCHEDULER_REMOVED_JOB_DELAY.getValueAsLong() *
1000;
public static final String SCHEDULING_SERVICE_RECOVER_TASKS_STATE_FINISHED = "SchedulingService::recoverTasksState finished";
......@@ -151,7 +151,7 @@ public class SchedulingService {
pinger = new NodePingThread(this);
pinger.start();
if (PASchedulerProperties.SCHEDULER_AUTOMATIC_REMOVED_JOB_DELAY.getValueAsInt() > 0) {
if (PASchedulerProperties.SCHEDULER_AUTOMATIC_REMOVED_JOB_DELAY.getValueAsLong() > 0) {
startHouseKeeping();
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment