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

Merge master into

Browse Source 
feature/RM-4311_NPEWhenUsingAllowedOperationsForUserWithoutPermission
This commit is contained in:
Silviu Dinuta
2016-11-03 11:21:26 +02:00
parent be9808c68b 4123ca264b
commit e4fd4606d7
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rm-community/rm-community-repo/source/java/org/alfresco/rm/rest/api/impl/RMSitesImpl.java
View File

@@ -232,7 +232,6 @@ public class RMSitesImpl extends SitesImpl implements RMSites
*/ */
public RMSite updateRMSite(String siteId, SiteUpdate update, Parameters parameters) public RMSite updateRMSite(String siteId, SiteUpdate update, Parameters parameters)
{ {
solveRMSiteNodeRefCaching();
Site updatedSite = updateSite(siteId, update, parameters); Site updatedSite = updateSite(siteId, update, parameters);
SiteInfo siteInfo = siteService.getSite(siteId); SiteInfo siteInfo = siteService.getSite(siteId);
RMSiteCompliance compliance = getCompliance(siteInfo); RMSiteCompliance compliance = getCompliance(siteInfo);
@@ -323,7 +322,6 @@ public class RMSitesImpl extends SitesImpl implements RMSites
@Override @Override
public RMSite getRMSite(String siteId) public RMSite getRMSite(String siteId)
{ {
solveRMSiteNodeRefCaching();
Site site = getSite(siteId); Site site = getSite(siteId);
SiteInfo siteInfo = siteService.getSite(siteId); SiteInfo siteInfo = siteService.getSite(siteId);
RMSiteCompliance compliance = getCompliance(siteInfo); RMSiteCompliance compliance = getCompliance(siteInfo);
@@ -333,12 +331,13 @@ public class RMSitesImpl extends SitesImpl implements RMSites
@Override @Override
public void deleteRMSite(String siteId, Parameters parameters) public void deleteRMSite(String siteId, Parameters parameters)
{ {
solveRMSiteNodeRefCaching();
deleteSite(siteId, parameters); deleteSite(siteId, parameters);
solveRMSiteNodeRefCaching();
} }
/** /**
* Method used for solving rm site nodeRef caching problem that affected rm site update, delete and get from rest api. See RM-4289 issue for details. * Method used for solving rm site nodeRef caching problem that affected rm site update and get from rest api, after site deletion from rest api.
* See RM-4289 issue for details.
* *
*/ */
private void solveRMSiteNodeRefCaching() private void solveRMSiteNodeRefCaching()