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 2017/10/17 16:11:36 UTC
[1/2] syncope git commit: Small checks
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ò <il...@apache.org>
Authored: Tue Oct 17 18:11:20 2017 +0200
Committer: Francesco Chicchiriccò <il...@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());
}
[2/2] syncope git commit: Small checks
Posted by il...@apache.org.
Small checks
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b59af727
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b59af727
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b59af727
Branch: refs/heads/master
Commit: b59af727695281420bf75136253f142d0b29f18a
Parents: dd152d8
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Oct 17 18:11:20 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Oct 17 18:11:27 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/b59af727/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 640aaba..a19d37f 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
@@ -177,7 +177,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/b59af727/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());
}