Repository: syncope Updated Branches: refs/heads/2_0_X 482a881ff -> 2d853137d refs/heads/master dd152d87d -> b59af7276
Small checks Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2d853137 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2d853137 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2d853137 Branch: refs/heads/2_0_X Commit: 2d853137df6608345d9b13a40c578f86427517bb Parents: 482a881 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Tue Oct 17 18:11:20 2017 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Tue Oct 17 18:11:20 2017 +0200 ---------------------------------------------------------------------- .../syncope/core/provisioning/java/MappingManagerImpl.java | 4 +++- .../syncope/core/rest/cxf/service/ResourceServiceImpl.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/2d853137/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java index 571aacc..40ebcd1 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java @@ -178,7 +178,9 @@ public class MappingManagerImpl implements MappingManager { values.addAll(alreadyAdded.getValue()); } - values.addAll(preparedAttr.getRight().getValue()); + if (preparedAttr.getRight().getValue() != null) { + values.addAll(preparedAttr.getRight().getValue()); + } attributes.add(AttributeBuilder.build(preparedAttr.getRight().getName(), values)); } http://git-wip-us.apache.org/repos/asf/syncope/blob/2d853137/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java ---------------------------------------------------------------------- diff --git a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java index ed0df7c..2b76dfc 100644 --- a/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java +++ b/core/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/ResourceServiceImpl.java @@ -130,6 +130,7 @@ public class ResourceServiceImpl extends AbstractServiceImpl implements Resource if (StringUtils.isNotBlank(result.getPagedResultsCookie())) { result.setNext(builder. replaceQueryParam(PARAM_CONNID_PAGED_RESULTS_COOKIE, result.getPagedResultsCookie()). + replaceQueryParam(PARAM_SIZE, listQuery.getSize()). build()); }