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 HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
89046: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      88945: Merged DEV to V4.2-BUG-FIX (4.2.4)
         88849 : MNT-12566 : log4j.logger.org.alfresco.repo.security.permissions=DEBUG breaks file upload via Share UI and recovery from Trashcan.
            - Added a check for "null" value


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94600 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 10:33:27 +00:00
parent 80db2b1110
commit 0952acf026
1 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoter.java
View File

@@ -408,6 +408,8 @@ public class ACLEntryVoter implements AccessDecisionVoter, InitializingBean
{ {
testNodeRef = getArgument(invocation, cad.parameter[0]); testNodeRef = getArgument(invocation, cad.parameter[0]);
if (log.isDebugEnabled()) if (log.isDebugEnabled())
{
if (testNodeRef != null)
{ {
if (nodeService.exists(testNodeRef)) if (nodeService.exists(testNodeRef))
{ {
@@ -419,6 +421,7 @@ public class ACLEntryVoter implements AccessDecisionVoter, InitializingBean
} }
} }
} }
}
else if (ChildAssociationRef.class.isAssignableFrom(params[cad.parameter[0]])) else if (ChildAssociationRef.class.isAssignableFrom(params[cad.parameter[0]]))
{ {
ChildAssociationRef testChildRef = getArgument(invocation, cad.parameter[0]); ChildAssociationRef testChildRef = getArgument(invocation, cad.parameter[0]);
@@ -462,6 +465,8 @@ public class ACLEntryVoter implements AccessDecisionVoter, InitializingBean
} }
if (log.isDebugEnabled()) if (log.isDebugEnabled())
{
if (testNodeRef != null)
{ {
if (nodeService.exists(testNodeRef)) if (nodeService.exists(testNodeRef))
{ {
@@ -474,6 +479,7 @@ public class ACLEntryVoter implements AccessDecisionVoter, InitializingBean
} }
} }
} }
}
else if (QName.class.isAssignableFrom(params[1]) && params[2] != null) else if (QName.class.isAssignableFrom(params[1]) && params[2] != null)
{ {
testNodeRef = getArgument(invocation, cad.parameter[0]); testNodeRef = getArgument(invocation, cad.parameter[0]);
@@ -495,6 +501,8 @@ public class ACLEntryVoter implements AccessDecisionVoter, InitializingBean
} }
if (log.isDebugEnabled()) if (log.isDebugEnabled())
{
if (testNodeRef != null)
{ {
if (nodeService.exists(testNodeRef)) if (nodeService.exists(testNodeRef))
{ {
@@ -507,6 +515,7 @@ public class ACLEntryVoter implements AccessDecisionVoter, InitializingBean
} }
} }
} }
}
else else
{ {
throw new ACLEntryVoterException("The specified parameter is not a Item"); throw new ACLEntryVoterException("The specified parameter is not a Item");