inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.0 (5.2.0) to HEAD (5.2)

Browse Source 
133842 rmunteanu: REPO-1746: Merge fixes for 5.2 GA issues to 5.2.0 branch
      Merged 5.2.N (5.2.1) to 5.2.0 (5.2.0)
         133336 rmunteanu: REPO-1654, REPO-1655: Update one permission field returns 500
            - Changed status code and message in case one of the required permission fields is missing.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134181 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2017-01-11 10:33:53 +00:00
parent 62038af3ee
commit 342fe6f26c
3 changed files with 56 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/rest/api/model/NodePermissions.java
View File

@@ -154,16 +154,17 @@ public class NodePermissions
NodePermission that = (NodePermission) o;
if (!authorityId.equals(that.authorityId))
if (authorityId != null ? !authorityId.equals(that.authorityId) : that.authorityId != null)
return false;
return name.equals(that.name);
return name != null ? name.equals(that.name) : that.name == null;
}
@Override
public int hashCode()
{
int result = authorityId.hashCode();
result = 31 * result + name.hashCode();
int result = authorityId != null ? authorityId.hashCode() : 0;
result = 31 * result + (name != null ? name.hashCode() : 0);
return result;
}
}