[fineract] branch develop updated: Avoid NullPointerException on calc schedule for floating rate (FINERACT-1286)

[ptuomola]

This is an automated email from the ASF dual-hosted git repository.

ptuomola pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git


The following commit(s) were added to refs/heads/develop by this push:
     new d4aa01c  Avoid NullPointerException on calc schedule for floating rate 
(FINERACT-1286)
d4aa01c is described below

commit d4aa01cf4b5b8973f37811713f852b292b00618e
Author: David Yahalomi <da...@articode.co>
AuthorDate: Mon Jan 11 18:16:14 2021 +0200

    Avoid NullPointerException on calc schedule for floating rate 
(FINERACT-1286)
---
 .../portfolio/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 f2c6d50..6cd5bec 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);
     }
 
 }