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 2015/05/27 12:20:54 UTC
[3/7] syncope git commit: [SYNCOPE-673] Applying provided patch
[SYNCOPE-673] Applying provided patch
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f672ce49
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f672ce49
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f672ce49
Branch: refs/heads/1_2_X
Commit: f672ce4925667fd80582878bdd55b9b0d644af0d
Parents: 13abc83
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed May 27 11:58:25 2015 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed May 27 11:58:25 2015 +0200
----------------------------------------------------------------------
.../syncope/core/sync/impl/RoleSyncResultHandler.java | 12 +++++-------
.../syncope/core/sync/impl/UserSyncResultHandler.java | 11 ++++-------
2 files changed, 9 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/f672ce49/core/src/main/java/org/apache/syncope/core/sync/impl/RoleSyncResultHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/sync/impl/RoleSyncResultHandler.java b/core/src/main/java/org/apache/syncope/core/sync/impl/RoleSyncResultHandler.java
index 72ab83d..42929fc 100644
--- a/core/src/main/java/org/apache/syncope/core/sync/impl/RoleSyncResultHandler.java
+++ b/core/src/main/java/org/apache/syncope/core/sync/impl/RoleSyncResultHandler.java
@@ -85,6 +85,9 @@ public class RoleSyncResultHandler extends AbstractSubjectSyncResultHandler {
RoleTO roleTO = RoleTO.class.cast(subjectTO);
WorkflowResult<Long> created = rwfAdapter.create(roleTO);
+
+ result.setId(created.getResult());
+
AttributeTO roleOwner = roleTO.getAttrMap().get(StringUtils.EMPTY);
if (roleOwner != null) {
roleOwnerMap.put(created.getResult(), roleOwner.getValues().iterator().next());
@@ -97,12 +100,7 @@ public class RoleSyncResultHandler extends AbstractSubjectSyncResultHandler {
taskExecutor.execute(tasks);
- roleTO = roleDataBinder.getRoleTO(created.getResult());
-
- result.setId(created.getResult());
- result.setName(getName(subjectTO));
-
- return roleTO;
+ return roleDataBinder.getRoleTO(created.getResult());
}
@Override
@@ -152,7 +150,7 @@ public class RoleSyncResultHandler extends AbstractSubjectSyncResultHandler {
taskExecutor.execute(tasks);
- final RoleTO after = roleDataBinder.getRoleTO(updated.getResult());
+ RoleTO after = roleDataBinder.getRoleTO(updated.getResult());
result.setName(getName(after));
return after;
http://git-wip-us.apache.org/repos/asf/syncope/blob/f672ce49/core/src/main/java/org/apache/syncope/core/sync/impl/UserSyncResultHandler.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/sync/impl/UserSyncResultHandler.java b/core/src/main/java/org/apache/syncope/core/sync/impl/UserSyncResultHandler.java
index 979feb3..ce055af 100644
--- a/core/src/main/java/org/apache/syncope/core/sync/impl/UserSyncResultHandler.java
+++ b/core/src/main/java/org/apache/syncope/core/sync/impl/UserSyncResultHandler.java
@@ -78,8 +78,9 @@ public class UserSyncResultHandler extends AbstractSubjectSyncResultHandler {
UserTO userTO = UserTO.class.cast(subjectTO);
Boolean enabled = syncUtilities.readEnabled(delta.getObject(), profile.getSyncTask());
- WorkflowResult<Map.Entry<Long, Boolean>> created =
- uwfAdapter.create(userTO, true, enabled, true);
+ WorkflowResult<Map.Entry<Long, Boolean>> created = uwfAdapter.create(userTO, true, enabled, true);
+
+ result.setId(created.getResult().getKey());
List<PropagationTask> tasks = propagationManager.getUserCreateTaskIds(created,
userTO.getPassword(), userTO.getVirAttrs(),
@@ -88,11 +89,7 @@ public class UserSyncResultHandler extends AbstractSubjectSyncResultHandler {
taskExecutor.execute(tasks);
- userTO = userDataBinder.getUserTO(created.getResult().getKey());
-
- result.setId(created.getResult().getKey());
-
- return userTO;
+ return userDataBinder.getUserTO(created.getResult().getKey());
}
@Override