Merge branch '3.9' of https://github.com/JumpMind/symmetric-ds.git in…

…to 3.9
JumpMind · May 31, 2018 · 9c6100b · 9c6100b
2 parents c9da386 + b017650
commit 9c6100b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/job/AbstractJob.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/job/AbstractJob.java
@@ -25,6 +25,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.math.NumberUtils;
 import org.jumpmind.symmetric.ISymmetricEngine;
 import org.jumpmind.symmetric.SymmetricException;
 import org.jumpmind.symmetric.common.Constants;
@@ -398,12 +399,12 @@ public long getAverageExecutionTimeInMs() {
     }
 
     public boolean isCronSchedule() {
-        String cronSchedule = parameterService.getString(jobDefinition.getCronParameter());
-        return !StringUtils.isEmpty(cronSchedule);
+        return !isPeriodicSchedule();
     }
 
     public boolean isPeriodicSchedule() {
-        return !isCronSchedule();
+        String schedule = getSchedule();
+        return NumberUtils.isDigits(schedule);
     }
 
     public String getSchedule() {