From 8eaf7d9625de31b3a1b7684b79f24a76da5712ad Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 11 Jun 2021 11:54:19 +0200 Subject: [PATCH] [Fix] Fixed PeriodHelper shift for days --- .../src/main/java/li/strolch/utils/time/PeriodHelper.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodHelper.java b/li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodHelper.java index 40bf22cea..5760bc08d 100644 --- a/li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodHelper.java +++ b/li.strolch.utils/src/main/java/li/strolch/utils/time/PeriodHelper.java @@ -239,9 +239,11 @@ public class PeriodHelper { return date; ZonedDateTime result = date.plusDays(shiftDays); - if (result.isBefore(end)) - return result; - return date.plusDays(shiftDays - 1); + while (!result.isBefore(end)) { + shiftDays--; + result = date.plusDays(shiftDays); + } + return result; } if (!period.isZero())