From 07b026aee05023b3ee66870082af52419a558bb8 Mon Sep 17 00:00:00 2001 From: Pramod Nuthakki Date: Sat, 15 Feb 2014 14:14:24 +0530 Subject: [PATCH] MIFOSX-895 : corrected validations --- .../serialization/LoanProductDataValidator.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java index 937642112..ea6a9a573 100644 --- a/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java +++ b/mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/serialization/LoanProductDataValidator.java @@ -321,11 +321,12 @@ public final class LoanProductDataValidator { final Boolean useBorrowerCycle = this.fromApiJsonHelper.extractBooleanNamed(LoanProductConstants.useBorrowerCycleParameterName, element); baseDataValidator.reset().parameter(LoanProductConstants.useBorrowerCycleParameterName).value(useBorrowerCycle).ignoreIfNull() .validateForBooleanValue(); + if(useBorrowerCycle){ + validateBorrowerCycleVariations(element, baseDataValidator); + } } - validateBorrowerCycleVariations(element, baseDataValidator); - throwExceptionIfValidationWarningsExist(dataValidationErrors); } @@ -575,9 +576,12 @@ public final class LoanProductDataValidator { final Boolean useBorrowerCycle = this.fromApiJsonHelper.extractBooleanNamed(LoanProductConstants.useBorrowerCycleParameterName, element); baseDataValidator.reset().parameter(LoanProductConstants.useBorrowerCycleParameterName).value(useBorrowerCycle).ignoreIfNull() .validateForBooleanValue(); + if(useBorrowerCycle){ + validateBorrowerCycleVariations(element, baseDataValidator); + } } - validateBorrowerCycleVariations(element, baseDataValidator); + throwExceptionIfValidationWarningsExist(dataValidationErrors); }