From e5dc02a8c14a658843897741ab57e18f032813eb Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 15 Jul 2015 17:12:59 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 108293: Merged 5.0.N (5.0.3) to HEAD-BUG-FIX (5.1/Cloud) 108286: Merged 5.0.2 (5.0.2) to 5.0.N (5.0.3) 108236: Merged /NESS/5.0.2-2015_07_13 (5.0.2) to URL: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/PATCHES/5.0.2 (..) 108185: MNT-14370 : Cannot delete a folder through FTP git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@108412 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java b/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java index de4dc4786c..592c6611cd 100644 --- a/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java +++ b/source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java @@ -1126,7 +1126,7 @@ public class ContentDiskDriver2 extends AlfrescoDiskDriver implements ExtendedD // Check if the folder is empty // Get pseudo files PseudoFileList pseudoFileList = new PseudoFileList(); - if (ctx.isPseudoFilesEnabled()) + if (session.isPseudoFilesEnabled() && ctx.isPseudoFilesEnabled()) { pseudoFileList = ctx.getPseudoFileOverlay().searchPseudoFiles(nodeRef, "*"); }