patrick/Homeautomation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIX: ScheduleExecutionService::executeEntry endless loop when property null

Browse Source
This commit is contained in:
Patrick Haßel 2022-10-24 11:29:11 +02:00
parent 8f92c986aa
commit 8e5d639bbe
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/de/ph87/homeautomation/schedule/ScheduleExecutionService.java
View File

@ -38,15 +38,17 @@ public class ScheduleExecutionService {
} }
private void executeEntry(final Schedule schedule, final ScheduleEntry entry, final ZonedDateTime now) { private void executeEntry(final Schedule schedule, final ScheduleEntry entry, final ZonedDateTime now) {
if (entry.getProperty() == null) {
log.error("Cannot execute Schedule {}: No property set!", schedule);
return;
}
entry.setLastClearTimestamp(entry.getNextClearTimestamp());
log.info("Executing Schedule \"{}\" Entry {}", schedule.getTitle(), entry); log.info("Executing Schedule \"{}\" Entry {}", schedule.getTitle(), entry);
propertyWriteService.writeToChannel(entry.getProperty(), entry.getValue()); entry.setLastClearTimestamp(entry.getNextClearTimestamp());
bulkExecutor.execute(entry.getBulk());
scheduleCalculationService.calculateSchedule(schedule, now); scheduleCalculationService.calculateSchedule(schedule, now);
if (entry.getProperty() != null) {
log.debug("Schedule setting property: {} = {}", entry.getProperty().getTitle(), entry.getValue());
propertyWriteService.writeToChannel(entry.getProperty(), entry.getValue());
}
if (entry.getBulk() != null) {
log.debug("Schedule executing Bulk: {}", entry.getBulk());
bulkExecutor.execute(entry.getBulk());
}
} }
} }