This is an automated email from the ASF dual-hosted git repository. shuber pushed a commit to branch unomi-1.5.x in repository https://gitbox.apache.org/repos/asf/unomi.git
commit 9a2199626597b1e35012b0c90c92b862aaaea5f9 Author: Serge Huber <[email protected]> AuthorDate: Sat Nov 7 18:18:01 2020 +0100 Fix NPE in SetEventOccurenceCountAction (cherry picked from commit 3d1e25ce8d1ec0908c4c00c4a079dea74e0a2add) --- .../baseplugin/actions/SetEventOccurenceCountAction.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetEventOccurenceCountAction.java b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetEventOccurenceCountAction.java index d74674f..cc04165 100644 --- a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetEventOccurenceCountAction.java +++ b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/SetEventOccurenceCountAction.java @@ -104,12 +104,18 @@ public class SetEventOccurenceCountAction implements ActionExecutor { event.getProfile().getSystemProperties().put("pastEvents", pastEvents); } - Calendar fromDateCalendar = DatatypeConverter.parseDateTime(fromDate); - Calendar toDateCalendar = DatatypeConverter.parseDateTime(toDate); + LocalDateTime fromDateTime = null; + if (fromDate != null) { + Calendar fromDateCalendar = DatatypeConverter.parseDateTime(fromDate); + fromDateTime = LocalDateTime.ofInstant(fromDateCalendar.toInstant(), ZoneId.of("UTC")); + } + LocalDateTime toDateTime = null; + if (toDate != null) { + Calendar toDateCalendar = DatatypeConverter.parseDateTime(toDate); + toDateTime = LocalDateTime.ofInstant(toDateCalendar.toInstant(), ZoneId.of("UTC")); + } LocalDateTime eventTime = LocalDateTime.ofInstant(event.getTimeStamp().toInstant(),ZoneId.of("UTC")); - LocalDateTime fromDateTime = LocalDateTime.ofInstant(fromDateCalendar.toInstant(), ZoneId.of("UTC")); - LocalDateTime toDateTime = LocalDateTime.ofInstant(toDateCalendar.toInstant(), ZoneId.of("UTC")); if (inTimeRange(eventTime, numberOfDays, fromDateTime, toDateTime)) { count++;
