inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-5506 Fix string to node ref cast exception

Browse Source
This commit is contained in:
MichalKinas
2024-02-13 11:33:20 +01:00
parent de6b062f3e
commit 8d978d6527
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
remote-api/src/main/java/org/alfresco/rest/api/impl/GroupsImpl.java
View File

@@ -147,7 +147,7 @@ public class GroupsImpl implements Groups
} }
Map<QName, Serializable> props = new HashMap<>(); Map<QName, Serializable> props = new HashMap<>();
if (StringUtils.isNotEmpty(group.getDescription())) if (group.getDescription() != null)
{ {
props.put(ContentModel.PROP_DESCRIPTION, group.getDescription()); props.put(ContentModel.PROP_DESCRIPTION, group.getDescription());
} }
@@ -170,7 +170,7 @@ public class GroupsImpl implements Groups
try try
{ {
if (StringUtils.isNotEmpty(group.getDescription())) if (group.getDescription() != null)
{ {
authorityService.setAuthorityDisplayNameAndDescription(groupId, group.getDisplayName(), group.getDescription()); authorityService.setAuthorityDisplayNameAndDescription(groupId, group.getDisplayName(), group.getDescription());
} }

13
repository/src/main/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryAfterInvocationProvider.java
View File

@@ -269,7 +269,18 @@ public class ACLEntryAfterInvocationProvider implements AfterInvocationProvider,
} }
else if (Pair.class.isAssignableFrom(returnedObject.getClass())) else if (Pair.class.isAssignableFrom(returnedObject.getClass()))
{ {
return decide(authentication, object, config, (Pair) returnedObject); Pair<?, ?> pair = (Pair<?, ?>) returnedObject;
if (pair.getSecond() != null && NodeRef.class.isAssignableFrom(pair.getSecond().getClass()))
{
return decide(authentication, object, config, pair);
} else
{
if (log.isDebugEnabled())
{
log.debug("Uncontrolled object - access allowed for " + object.getClass().getName());
}
return returnedObject;
}
} }
else if (ChildAssociationRef.class.isAssignableFrom(returnedObject.getClass())) else if (ChildAssociationRef.class.isAssignableFrom(returnedObject.getClass()))
{ {