diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/AccountAssociationsReadPlatformServiceImpl.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/AccountAssociationsReadPlatformServiceImpl.java index 25f4bc37c..e7fc10d2c 100755 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/AccountAssociationsReadPlatformServiceImpl.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/AccountAssociationsReadPlatformServiceImpl.java @@ -74,8 +74,10 @@ public class AccountAssociationsReadPlatformServiceImpl implements AccountAssoci final List statusList = this.jdbcTemplate.queryForList(sql, Integer.class, savingsId); for (final Integer status : statusList) { - final LoanStatus loanStatus = LoanStatus.fromInt(status); - if (loanStatus.isActiveOrAwaitingApprovalOrDisbursal() || loanStatus.isUnderTransfer()) { return true; } + if(status !=null){ + final LoanStatus loanStatus = LoanStatus.fromInt(status); + if (loanStatus.isActiveOrAwaitingApprovalOrDisbursal() || loanStatus.isUnderTransfer()) { return true; } + } } final String savsql = "select savingAccount.status_enum as status from m_portfolio_account_associations aa " @@ -84,10 +86,11 @@ public class AccountAssociationsReadPlatformServiceImpl implements AccountAssoci final List savstatusList = this.jdbcTemplate.queryForList(savsql, Integer.class, savingsId); for (final Integer status : savstatusList) { - final SavingsAccountStatusType saveStatus = SavingsAccountStatusType.fromInt(status); - if (saveStatus.isActiveOrAwaitingApprovalOrDisbursal() || saveStatus.isUnderTransfer()) { return true; } + if(status !=null){ + final SavingsAccountStatusType saveStatus = SavingsAccountStatusType.fromInt(status); + if (saveStatus.isActiveOrAwaitingApprovalOrDisbursal() || saveStatus.isUnderTransfer()) { return true; } + } } - return hasActiveAccount; }