You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by fm...@apache.org on 2014/06/24 15:17:33 UTC
svn commit: r1605076 - in /syncope/branches/1_1_X/core/src:
main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java
test/java/org/apache/syncope/core/rest/RoleTestITCase.java
Author: fmartelli
Date: Tue Jun 24 13:17:33 2014
New Revision: 1605076
URL: http://svn.apache.org/r1605076
Log:
[SYNCOPE-515] fix for the branch
Modified:
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java
syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
Modified: syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java?rev=1605076&r1=1605075&r2=1605076&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java (original)
+++ syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/sync/impl/SyncopeSyncResultHandler.java Tue Jun 24 13:17:33 2014
@@ -266,7 +266,7 @@ public class SyncopeSyncResultHandler im
}
public Map<Long, String> getRoleOwnerMap() {
- return roleOwnerMap;
+ return this.roleOwnerMap;
}
@Override
@@ -641,7 +641,7 @@ public class SyncopeSyncResultHandler im
UserMod actual = attrTransformer.transform(userMod);
LOG.debug("Transformed: {}", actual);
- delta = actions.beforeUpdate(this, delta, before, userMod);
+ delta = actions.beforeUpdate(this, delta, before, actual);
WorkflowResult<Map.Entry<Long, Boolean>> updated;
try {
Modified: syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java?rev=1605076&r1=1605075&r2=1605076&view=diff
==============================================================================
--- syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java (original)
+++ syncope/branches/1_1_X/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java Tue Jun 24 13:17:33 2014
@@ -28,6 +28,7 @@ import static org.junit.Assert.fail;
import java.security.AccessControlException;
import java.util.ArrayList;
import java.util.List;
+import org.apache.syncope.common.mod.ReferenceMod;
import org.apache.syncope.common.mod.RoleMod;
import org.apache.syncope.common.services.RoleService;
@@ -112,6 +113,13 @@ public class RoleTestITCase extends Abst
resourceService.getConnectorObject(RESOURCE_NAME_LDAP, AttributableType.ROLE, roleTO.getId());
assertNotNull(connObjectTO);
assertNotNull(connObjectTO.getAttributeMap().get("owner"));
+
+ // SYNCOPE-515: remove ownership
+ final RoleMod roleMod = new RoleMod();
+ roleMod.setId(roleTO.getId());
+ roleMod.setRoleOwner(new ReferenceMod());
+
+ assertNull(roleService.update(roleMod.getId(), roleMod).getRoleOwner());
}
@Test