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

HEAD test/build fix (eg. ChainingUserRegistrySynchronizerTest)

Browse Source 
- running on Oracle ... Error setting null parameter ... Caused by: java.sql.SQLException: Invalid column type: 1111
- fix GetAuthorities CQ (typo in AuthorityDAOImpl + container is mandatory)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28698 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2011-06-29 15:12:14 +00:00
parent 43757d8cb6
commit d02b78187e
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/security/authority/AuthorityDAOImpl.java
View File

@@ -1019,7 +1019,7 @@ public class AuthorityDAOImpl implements AuthorityDAO, NodeServicePolicies.Befor
NodeRef zoneRef = getZone(zoneName); NodeRef zoneRef = getZone(zoneName);
if (zoneRef == null) if (zoneRef == null)
{ {
Collections.emptySet(); return Collections.emptySet();
} }
return new HashSet<String>(getAuthoritiesImpl(type, zoneRef, null, false, false, new PagingRequest(0, Integer.MAX_VALUE, null)).getPage()); return new HashSet<String>(getAuthoritiesImpl(type, zoneRef, null, false, false, new PagingRequest(0, Integer.MAX_VALUE, null)).getPage());
} }

19
source/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQueryFactory.java
View File

@@ -90,26 +90,19 @@ public class GetAuthoritiesCannedQueryFactory extends AbstractCannedQueryFactory
public CannedQuery<AuthorityInfo> getCannedQuery(AuthorityType type, NodeRef containerRef, String displayNameFilter, boolean sortByDisplayName, boolean sortAscending, PagingRequest pagingRequest) public CannedQuery<AuthorityInfo> getCannedQuery(AuthorityType type, NodeRef containerRef, String displayNameFilter, boolean sortByDisplayName, boolean sortAscending, PagingRequest pagingRequest)
{ {
ParameterCheck.mandatory("containerRef", containerRef);
ParameterCheck.mandatory("pagingRequest", pagingRequest); ParameterCheck.mandatory("pagingRequest", pagingRequest);
if ((type == null) && (containerRef == null))
{
throw new IllegalArgumentException("Type and/or containerRef required - both cannot be null");
}
int requestTotalCountMax = pagingRequest.getRequestTotalCountMax(); int requestTotalCountMax = pagingRequest.getRequestTotalCountMax();
Long containerNodeId = null; Pair<Long, NodeRef> nodePair = nodeDAO.getNodePair(tenantService.getName(containerRef));
if (containerRef != null) if (nodePair == null)
{ {
Pair<Long, NodeRef> nodePair = nodeDAO.getNodePair(tenantService.getName(containerRef)); throw new InvalidNodeRefException("Container ref does not exist: " + containerRef, containerRef);
if (nodePair == null)
{
throw new InvalidNodeRefException("Container ref does not exist: " + containerRef, containerRef);
}
containerNodeId = nodePair.getFirst();
} }
Long containerNodeId = nodePair.getFirst();
// specific query params // specific query params
GetAuthoritiesCannedQueryParams paramBean = new GetAuthoritiesCannedQueryParams(type, GetAuthoritiesCannedQueryParams paramBean = new GetAuthoritiesCannedQueryParams(type,
containerNodeId, containerNodeId,