Merge pull request #3779 from fviale/master

Fix bad mistake in housekeeping

scheduler/scheduler-server/src/main/java/org/ow2/proactive/scheduler/core/SchedulerFrontend.java

@@ -185,7 +185,7 @@ public class SchedulerFrontend implements InitActive, Scheduler, RunActive, EndA
      * 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);

scheduler/scheduler-server/src/main/java/org/ow2/proactive/scheduler/core/SchedulingService.java

@@ -86,10 +86,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;
 
     static final String GENERIC_INFO_REMOVE_DELAY = "REMOVE_DELAY";
@@ -158,7 +158,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();
         }