You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2020/04/24 14:48:39 UTC
[syncope] branch master updated: Upgrading Joda
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new d987d6d Upgrading Joda
d987d6d is described below
commit d987d6d4b5d3d161e85b2b243cb92d713bbb05db
Author: Francesco Chicchiriccò <il...@apache.org>
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/idm/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java b/core/idm/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java
index 413ee28..57f1590 100644
--- a/core/idm/logic/src/main/java/org/apache/syncope/core/logic/ReconciliationLogic.java
+++ b/core/idm/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 d6225bf..300d1d4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -445,7 +445,7 @@ under the License.
<commons-text.version>1.8</commons-text.version>
<commons-logging.version>1.1.3</commons-logging.version>
- <joda.version>2.10.5</joda.version>
+ <joda.version>2.10.6</joda.version>
<cas.version>6.2.0-SNAPSHOT</cas.version>