From 0952acf026aca29c31a822c7f79aceae4005426d Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 31 Jan 2015 10:33:27 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)    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
---
 .../permissions/impl/acegi/ACLEntryVoter.java | 45 +++++++++++--------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoter.java b/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoter.java
index f526ed4fae..d4b89d3f99 100644
--- a/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoter.java
+++ b/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoter.java
@@ -409,13 +409,16 @@ public class ACLEntryVoter implements AccessDecisionVoter, InitializingBean
                     testNodeRef = getArgument(invocation, cad.parameter[0]);
                     if (log.isDebugEnabled())
                     {
-                        if (nodeService.exists(testNodeRef))
+                        if (testNodeRef != null)
                         {
-                            log.debug("\tPermission test on node " + nodeService.getPath(testNodeRef));
-                        }
-                        else
-                        {
-                            log.debug("\tPermission test on non-existing node " +testNodeRef);
+                            if (nodeService.exists(testNodeRef))
+                            {
+                                log.debug("\tPermission test on node " + nodeService.getPath(testNodeRef));
+                            }
+                            else
+                            {
+                                log.debug("\tPermission test on non-existing node " +testNodeRef);
+                            } 
                         }
                     }
                 }
@@ -463,13 +466,16 @@ public class ACLEntryVoter implements AccessDecisionVoter, InitializingBean
 
                             if (log.isDebugEnabled())
                             {
-                                if (nodeService.exists(testNodeRef))
+                                if (testNodeRef != null)
                                 {
-                                    log.debug("\tPermission test on node " + nodeService.getPath(testNodeRef));
-                                }
-                                else
-                                {
-                                    log.debug("\tPermission test on non-existing node " + testNodeRef);
+                                    if (nodeService.exists(testNodeRef))
+                                    {
+                                        log.debug("\tPermission test on node " + nodeService.getPath(testNodeRef));
+                                    }
+                                    else
+                                    {
+                                        log.debug("\tPermission test on non-existing node " + testNodeRef);
+                                    } 
                                 }
                             }
                         }
@@ -496,13 +502,16 @@ public class ACLEntryVoter implements AccessDecisionVoter, InitializingBean
 
                         if (log.isDebugEnabled())
                         {
-                            if (nodeService.exists(testNodeRef))
+                            if (testNodeRef != null)
                             {
-                                log.debug("\tPermission test on node " + nodeService.getPath(testNodeRef));
-                            }
-                            else
-                            {
-                                log.debug("\tPermission test on non-existing node " + testNodeRef);
+                                if (nodeService.exists(testNodeRef))
+                                {
+                                    log.debug("\tPermission test on node " + nodeService.getPath(testNodeRef));
+                                }
+                                else
+                                {
+                                    log.debug("\tPermission test on non-existing node " + testNodeRef);
+                                } 
                             }
                         }
                     }