From 790b2cfbf8d298a00d71b266ce91ae387d5b4da3 Mon Sep 17 00:00:00 2001
From: BLasan <benuraab@gmail.com>
Date: Tue, 2 Nov 2021 17:27:27 +0530
Subject: [PATCH] Fix: Loan Collateral for multi disbursement

---
 .../service/LoanWritePlatformServiceJpaRepositoryImpl.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
index cbe94031e..ca560d75e 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanWritePlatformServiceJpaRepositoryImpl.java
@@ -376,10 +376,11 @@ public class LoanWritePlatformServiceJpaRepositoryImpl implements LoanWritePlatf
 
         // Get disbursedAmount
         final BigDecimal disbursedAmount = loan.getDisbursedAmount();
+        final Set<LoanCollateralManagement> loanCollateralManagements = loan.getLoanCollateralManagements();
 
         // Get relevant loan collateral modules
-        if (AccountType.fromInt(loan.getLoanType()).isIndividualAccount()) {
-            final Set<LoanCollateralManagement> loanCollateralManagements = loan.getLoanCollateralManagements();
+        if ((loanCollateralManagements != null && loanCollateralManagements.size() != 0)
+                && AccountType.fromInt(loan.getLoanType()).isIndividualAccount()) {
 
             BigDecimal totalCollateral = BigDecimal.valueOf(0);