You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by md...@apache.org on 2015/12/04 17:42:27 UTC
syncope git commit: [SYNCOPE-739] Extended the fix to roles
Repository: syncope
Updated Branches:
refs/heads/1_2_X 080fa9dc1 -> fe3d08a35
[SYNCOPE-739] Extended the fix to roles
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/fe3d08a3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/fe3d08a3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/fe3d08a3
Branch: refs/heads/1_2_X
Commit: fe3d08a35f480e86d67d279026168c770ff9407f
Parents: 080fa9d
Author: Marco Di Sabatino Di Diodoro <md...@apache.org>
Authored: Fri Dec 4 17:42:09 2015 +0100
Committer: Marco Di Sabatino Di Diodoro <md...@apache.org>
Committed: Fri Dec 4 17:42:09 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/syncope/core/rest/data/RoleDataBinder.java | 5 +++++
.../apache/syncope/core/sync/impl/RoleSyncResultHandler.java | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/fe3d08a3/core/src/main/java/org/apache/syncope/core/rest/data/RoleDataBinder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/syncope/core/rest/data/RoleDataBinder.java b/core/src/main/java/org/apache/syncope/core/rest/data/RoleDataBinder.java
index fcd5c06..ff0721f 100644
--- a/core/src/main/java/org/apache/syncope/core/rest/data/RoleDataBinder.java
+++ b/core/src/main/java/org/apache/syncope/core/rest/data/RoleDataBinder.java
@@ -456,4 +456,9 @@ public class RoleDataBinder extends AbstractAttributableDataBinder {
public RoleTO getRoleTO(final Long roleId) {
return getRoleTO(getRoleFromId(roleId), true);
}
+
+ @Transactional(readOnly = true)
+ public RoleTO getRoleTO(final Long roleId, final boolean details) {
+ return getRoleTO(getRoleFromId(roleId), details);
+ }
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/fe3d08a3/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 42929fc..de3701a 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
@@ -59,7 +59,7 @@ public class RoleSyncResultHandler extends AbstractSubjectSyncResultHandler {
@Override
protected AbstractSubjectTO getSubjectTO(final long id) {
try {
- return roleDataBinder.getRoleTO(id);
+ return roleDataBinder.getRoleTO(id, false);
} catch (Exception e) {
LOG.warn("Error retrieving role {}", id, e);
return null;