From d4aa01cf4b5b8973f37811713f852b292b00618e Mon Sep 17 00:00:00 2001 From: David Yahalomi Date: Mon, 11 Jan 2021 18:16:14 +0200 Subject: [PATCH] Avoid NullPointerException on calc schedule for floating rate (FINERACT-1286) --- .../floatingrates/domain/FloatingRatePeriod.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/domain/FloatingRatePeriod.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/domain/FloatingRatePeriod.java index f2c6d507f..6cd5bec1b 100644 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/domain/FloatingRatePeriod.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/floatingrates/domain/FloatingRatePeriod.java @@ -149,11 +149,13 @@ public class FloatingRatePeriod extends AbstractPersistableCustom { final LocalDate fromDate = ZonedDateTime.ofInstant(getFromDate().toInstant(), DateUtils.getDateTimeZoneOfTenant()).toLocalDate(); final LocalDate createdOn = ZonedDateTime.ofInstant(getCreatedOn().toInstant(), DateUtils.getDateTimeZoneOfTenant()).toLocalDate(); - final LocalDate modidiedOn = ZonedDateTime.ofInstant(getModifiedOn().toInstant(), DateUtils.getDateTimeZoneOfTenant()) + final LocalDate modifiedOn = ZonedDateTime.ofInstant(getModifiedOn().toInstant(), DateUtils.getDateTimeZoneOfTenant()) .toLocalDate(); - return new FloatingRatePeriodData(getId(), fromDate, interest, isDifferentialToBaseLendingRate(), isActive(), - getCreatedBy().getUsername(), createdOn, getModifiedBy().getUsername(), modidiedOn); + String createdBy = getCreatedBy() != null ? getCreatedBy().getUsername() : null; + String modifiedBy = getModifiedBy() != null ? getModifiedBy().getUsername() : null; + return new FloatingRatePeriodData(getId(), fromDate, interest, isDifferentialToBaseLendingRate(), isActive(), createdBy, createdOn, + modifiedBy, modifiedOn); } }