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.1-MC1 (5.1.0) to HEAD (5.1)

Browse Source 
119082 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      118568 adavis: Merged 5.0.2-CLOUD42 (Cloud ) to 5.1.N (5.1.1)
         118398 gjames: RA-607 BCRYPT Improved the logging


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119923 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jean-Pierre Huynh
2015-12-10 10:17:10 +00:00
parent 6f569467af
commit 921dbb04ae
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/java/org/alfresco/rest/api/impl/SitesImpl.java
View File

@@ -73,6 +73,8 @@ import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService; import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair; import org.alfresco.util.Pair;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/** /**
* Centralises access to site services and maps between representations. * Centralises access to site services and maps between representations.
@@ -84,6 +86,7 @@ public class SitesImpl implements Sites
{ {
private static final String FAVOURITE_SITES_PREFIX = "org.alfresco.share.sites.favourites."; private static final String FAVOURITE_SITES_PREFIX = "org.alfresco.share.sites.favourites.";
private static final int FAVOURITE_SITES_PREFIX_LENGTH = FAVOURITE_SITES_PREFIX.length(); private static final int FAVOURITE_SITES_PREFIX_LENGTH = FAVOURITE_SITES_PREFIX.length();
private static final Log logger = LogFactory.getLog(SitesImpl.class);
protected Nodes nodes; protected Nodes nodes;
protected People people; protected People people;
@@ -282,15 +285,17 @@ public class SitesImpl implements Sites
} }
siteId = siteInfo.getShortName(); siteId = siteInfo.getShortName();
String role = siteService.getMembersRole(siteId, personId); logger.debug("Getting member role for "+siteId+ " person "+personId);
if(role != null) String role = siteService.getMembersRole(siteId, personId);
{ if(role != null)
siteMember = new SiteMember(personId, role); {
} siteMember = new SiteMember(personId, role);
else }
{ else
throw new RelationshipResourceNotFoundException(personId, siteId); {
} logger.debug("Getting member role but role is null");
throw new RelationshipResourceNotFoundException(personId, siteId);
}
return siteMember; return siteMember;
} }

2
source/test-java/org/alfresco/rest/api/tests/client/PublicApiClient.java
View File

@@ -110,7 +110,7 @@ public class PublicApiClient
this.rc.set(rc); this.rc.set(rc);
} }
private RequestContext getRequestContext() public RequestContext getRequestContext()
{ {
RequestContext context = rc.get(); RequestContext context = rc.get();
if(context == null) if(context == null)