[fineract] branch develop updated: commit for FINERACT-52 (Null value not handled in 'ClientWritePlatformServiceJpaRepositoryImpl.CloseClient' date comparison)

[vishwasbabu]

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

vishwasbabu 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 d8f14a6  commit for FINERACT-52 (Null value not handled in 
'ClientWritePlatformServiceJpaRepositoryImpl.CloseClient' date comparison)
     new 6615613  Merge pull request #176 from emmanuelnnaa/FINERACT-52
d8f14a6 is described below

commit d8f14a662a86e0c2046ca7470d1f9d5ac4199bd8
Author: Emmanuel Nnaa <emmanueln...@musoni.eu>
AuthorDate: Mon Jul 18 12:52:16 2016 +0200

    commit for FINERACT-52 (Null value not handled in 
'ClientWritePlatformServiceJpaRepositoryImpl.CloseClient' date comparison)
---
 .../client/service/ClientWritePlatformServiceJpaRepositoryImpl.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
 
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
index 26a1d42..5c9bec0 100644
--- 
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
+++ 
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/service/ClientWritePlatformServiceJpaRepositoryImpl.java
@@ -631,7 +631,7 @@ public class ClientWritePlatformServiceJpaRepositoryImpl 
implements ClientWriteP
                 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());