Merge pull request apache#176 from emmanuelnnaa/FINERACT-52

commit for FINERACT-52 (Null value not handled in 'ClientWritePlatformServiceJpaRepositoryImpl.CloseClient' date comparison)
swagatikapanda123 · Feb 26, 2019 · 6615613 · 6615613
2 parents 0a24570 + d8f14a6
commit 6615613
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java b/...apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
@@ -713,7 +713,7 @@ public CommandProcessingResult closeClient(final Long clientId, final JsonComman
                 throw new InvalidClientStateTransitionException("close", "is.under.transfer", errorMessage);
             }
 
-            if (client.isNotPending() && client.getActivationLocalDate().isAfter(closureDate)) {
+            if (client.isNotPending() && client.getActivationLocalDate() != null && client.getActivationLocalDate().isAfter(closureDate)) {
                 final String errorMessage = "The client closureDate cannot be before the client ActivationDate.";
                 throw new InvalidClientStateTransitionException("close", "date.cannot.before.client.actvation.date", errorMessage,
                         closureDate, client.getActivationLocalDate());