From f71280b165ace7dc0c2ad6b69d697de9913755c6 Mon Sep 17 00:00:00 2001 From: Steven Glover Date: Tue, 24 Apr 2012 11:45:30 +0000 Subject: [PATCH] Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD: 35606: Merged BRANCHES/V3.4 to BRANCHES/DEV/V4.0-BUG-FIX: 35375: Fix for ALF-13711: "Hidden Aspect applied to Mac powepoint files." - re-instated previous hidden aspect behaviour - also make sure the HiddenAspectTest runs git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@35613 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../FilenameFilteringInterceptor.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/source/java/org/alfresco/repo/model/filefolder/FilenameFilteringInterceptor.java b/source/java/org/alfresco/repo/model/filefolder/FilenameFilteringInterceptor.java index 5af9dd1718..a079090bcf 100644 --- a/source/java/org/alfresco/repo/model/filefolder/FilenameFilteringInterceptor.java +++ b/source/java/org/alfresco/repo/model/filefolder/FilenameFilteringInterceptor.java @@ -247,7 +247,6 @@ public class FilenameFilteringInterceptor implements MethodInterceptor else { ret = invocation.proceed(); - FileInfoImpl fileInfo = (FileInfoImpl)ret; @@ -265,20 +264,20 @@ public class FilenameFilteringInterceptor implements MethodInterceptor // Name is changing // check against all the regular expressions checkTemporaryAspect(temporaryFiles.isFiltered(newName), sourceNodeRef); - if(getMode() == Mode.ENHANCED) - { - hiddenAspect.checkHidden(sourceNodeRef, true); - } } // now do the move ret = invocation.proceed(); + + if(getMode() == Mode.ENHANCED) + { + hiddenAspect.checkHidden(sourceNodeRef, true); + } } else if (methodName.startsWith("copy")) { ret = invocation.proceed(); - - + FileInfoImpl fileInfo = (FileInfoImpl) ret; String filename = fileInfo.getName(); @@ -317,13 +316,14 @@ public class FilenameFilteringInterceptor implements MethodInterceptor // check against all the regular expressions checkTemporaryAspect(temporaryFiles.isFiltered(newName), sourceNodeRef); + + ret = invocation.proceed(); + if(getMode() == Mode.ENHANCED) { hiddenAspect.checkHidden(sourceNodeRef, true); } - - ret = invocation.proceed(); - + return ret; } else