You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ar...@apache.org on 2022/12/16 13:20:57 UTC
[fineract] branch develop updated: FINERACT-1724: Fix NPE issues + Incorrect arguments to mysqld_stmt_bulk_execute
This is an automated email from the ASF dual-hosted git repository.
arnold 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 70f278350 FINERACT-1724: Fix NPE issues + Incorrect arguments to mysqld_stmt_bulk_execute
70f278350 is described below
commit 70f2783508f117db5ae9843e2d791bf6645f9937
Author: Adam Saghy <ad...@gmail.com>
AuthorDate: Thu Dec 15 17:39:40 2022 +0100
FINERACT-1724: Fix NPE issues + Incorrect arguments to mysqld_stmt_bulk_execute
---
buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle | 2 +-
.../savings/service/SavingsAccountInterestPostingServiceImpl.java | 3 ++-
renovate.json | 4 ++++
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle
index 45fde1f7d..b9e9f7c10 100644
--- a/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle
+++ b/buildSrc/src/main/groovy/org.apache.fineract.dependencies.gradle
@@ -222,7 +222,7 @@ dependencyManagement {
dependency "io.github.resilience4j:resilience4j-spring-boot2:1.7.1"
- dependency ('org.mariadb.jdbc:mariadb-java-client:3.1.0') {
+ dependency ('org.mariadb.jdbc:mariadb-java-client:3.0.9') {
exclude 'org.slf4j:jcl-over-slf4j'
exclude 'org.slf4j:slf4j-api'
}
diff --git a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountInterestPostingServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountInterestPostingServiceImpl.java
index cbfd124fa..d9bba7342 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountInterestPostingServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountInterestPostingServiceImpl.java
@@ -489,7 +489,8 @@ public class SavingsAccountInterestPostingServiceImpl implements SavingsAccountI
private boolean createWithHoldTransaction(final BigDecimal amount, final LocalDate date, final SavingsAccountData savingsAccountData) {
boolean isTaxAdded = false;
- if (savingsAccountData.getTaxGroup() != null && amount.compareTo(BigDecimal.ZERO) > 0) {
+ if (savingsAccountData.getTaxGroup() != null && savingsAccountData.getTaxGroup().getTaxAssociations() != null
+ && amount.compareTo(BigDecimal.ZERO) > 0) {
Map<TaxComponentData, BigDecimal> taxSplit = TaxUtils.splitTaxData(amount, date,
savingsAccountData.getTaxGroup().getTaxAssociations().stream().collect(Collectors.toSet()), amount.scale());
BigDecimal totalTax = TaxUtils.totalTaxDataAmount(taxSplit);
diff --git a/renovate.json b/renovate.json
index d21bc6422..75b55e9d2 100644
--- a/renovate.json
+++ b/renovate.json
@@ -58,6 +58,10 @@
"matchPackageNames": ["gradle"],
"allowedVersions": "<=7.5.1"
},
+ {
+ "matchPackageNames": ["org.mariadb.jdbc:mariadb-java-client"],
+ "allowedVersions": "<=3.0.9"
+ },
{
"depTypeList": ["dependencies"],
"updateTypes": ["patch", "minor"],