Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-13 17:05:43 +01:00
Code Issues Packages Projects Releases Activity

merge with 2.0.0-m3

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-06-25 09:53:44 +02:00
parent 80febf9424 e73e05b676
commit ebb23981b2
45 changed files with 246 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scm-webapp/src/main/java/sonia/scm/schedule/CronExpression.java
View File

@@ -30,7 +30,7 @@ final class CronExpression {
boolean shouldRun(ZonedDateTime time) {
ZonedDateTime now = ZonedDateTime.now(clock);
return time.isBefore(now);
return time.isBefore(now) || time.isEqual(now);
}
Optional<ZonedDateTime> calculateNextRun() {

3
scm-webapp/src/main/java/sonia/scm/schedule/CronTask.java
View File

@@ -32,7 +32,7 @@ class CronTask implements Task, Runnable {
@Override
public synchronized void run() {
if (expression.shouldRun(nextRun)) {
if (hasNextRun() && expression.shouldRun(nextRun)) {
LOG.debug("execute task {}, because of matching expression {}", name, expression);
runnable.run();
Optional<ZonedDateTime> next = expression.calculateNextRun();
@@ -40,6 +40,7 @@ class CronTask implements Task, Runnable {
nextRun = next.get();
} else {
LOG.debug("cancel task {}, because expression {} has no next execution", name, expression);
nextRun = null;
cancel();
}
} else {