Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions

View File

@@ -40,6 +40,8 @@ import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.ResultSetRow;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.cmr.security.AccessStatus;
import org.alfresco.service.cmr.security.PermissionService;
import org.alfresco.util.ISO9075;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -135,8 +137,10 @@ public class Search extends BaseScopableProcessorExtension
*/
public ScriptNode findNode(NodeRef ref)
{
ParameterCheck.mandatory("ref", ref);
if (this.services.getNodeService().exists(ref))
ParameterCheck.mandatory("ref", ref);
if (this.services.getNodeService().exists(ref)
&& (this.services.getPermissionService().hasPermission(ref,
PermissionService.READ) == AccessStatus.ALLOWED))
{
return new ScriptNode(ref, this.services, getScope());
}