diff --git a/pom.xml b/pom.xml index 109f333..653786c 100644 --- a/pom.xml +++ b/pom.xml @@ -168,12 +168,7 @@ com.atlassian.crowd crowd-integration-client-rest - 4.3.11 - - - com.atlassian.crowd.client - atlassian-crowd-rest-client - 1.4 + 4.4.5 com.atlassian.security diff --git a/src/main/java/de/aservo/ldap/adapter/backend/MirroredCrowdDirectoryBackend.java b/src/main/java/de/aservo/ldap/adapter/backend/MirroredCrowdDirectoryBackend.java index 4bae4cb..3588a45 100644 --- a/src/main/java/de/aservo/ldap/adapter/backend/MirroredCrowdDirectoryBackend.java +++ b/src/main/java/de/aservo/ldap/adapter/backend/MirroredCrowdDirectoryBackend.java @@ -385,21 +385,30 @@ private void performFullUpdate() { MappableCursor memberships = directoryBackend.getMemberships(); int groupPage = 0; int userPage = 0; + int groupCount = 0; + int userCount = 0; while (groupPage != -1 || userPage != -1) { if (groupPage >= 0) { - if (directoryBackend.upsertAllGroups(groupPage++ * pageSize, pageSize) < pageSize) + int groups = directoryBackend.upsertAllGroups(groupPage++ * pageSize, pageSize); + logger.info("upsertAlLGroups: received {} groups.", groups); + groupCount += groups; + if ( groups < pageSize) groupPage = -1; } if (userPage >= 0) { - if (directoryBackend.upsertAllUsers(userPage++ * pageSize, pageSize) < pageSize) + int users = directoryBackend.upsertAllUsers(userPage++ * pageSize, pageSize); + logger.info("upsertAllUsers: received {} users.", users); + userCount += users; + if (users < pageSize) userPage = -1; } } + logger.info("FullUpdate: received {} users and {} groups", userCount, groupCount); while (memberships.next()) directoryBackend.upsertMembership(memberships.get());