[fineract] branch develop updated: fix bug causing NullPointerException in SavingsAccount (FINERACT-957)

[vo...@apache.org]

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

vorburger 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 e122f1f  fix bug causing NullPointerException in SavingsAccount (FINERACT-957)
e122f1f is described below

commit e122f1ffd382fbc1bc1ec0e7034f3fff3bea80b2
Author: Michael Vorburger <mi...@vorburger.ch>
AuthorDate: Sat May 9 03:41:22 2020 +0200

    fix bug causing NullPointerException in SavingsAccount (FINERACT-957)
---
 .../org/apache/fineract/portfolio/savings/domain/SavingsAccount.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccount.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccount.java
index e55a654..178ae75 100755
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccount.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccount.java
@@ -1572,7 +1572,7 @@ public class SavingsAccount extends AbstractPersistableCustom {
         Long officeId = null;
         if (this.client != null) {
             officeId = this.client.officeId();
-        } else {
+        } else if (this.group != null) {
             officeId = this.group.officeId();
         }
         return officeId;
@@ -1582,7 +1582,7 @@ public class SavingsAccount extends AbstractPersistableCustom {
         Office office = null;
         if (this.client != null) {
             office = this.client.getOffice();
-        } else {
+        } else if (this.group != null) {
             office = this.group.getOffice();
         }
         return office;