This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 07d4a954edaab6cee610e7691f999800df303124 Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Fri Apr 24 14:51:48 2020 +0200 Upgrading Joda --- .../main/java/org/apache/syncope/core/logic/ReconciliationLogic.java | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java index 517025c..f0739b5 100644 --- a/core/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java +++ b/core/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java @@ -436,7 +436,7 @@ public class ReconciliationLogic extends AbstractTransactionalLogic<EntityTO> { if (spec.getIgnorePaging()) { matching = new ArrayList<>(); - int count = searchDAO.count(adminRealms, searchCond, anyType.getKind()); + int count = searchDAO.count(adminRealms, effectiveCond, anyType.getKind()); int pages = (count / AnyDAO.DEFAULT_PAGE_SIZE) + 1; for (int p = 1; p <= pages; p++) { diff --git a/pom.xml b/pom.xml index 7f7d467..30ff628 100644 --- a/pom.xml +++ b/pom.xml @@ -447,7 +447,7 @@ under the License. <tika.version>1.24.1</tika.version> - <joda.version>2.10.5</joda.version> + <joda.version>2.10.6</joda.version> <h2.version>1.4.200</h2.version>
