inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.1 to HEAD

Browse Source 
13077: Abstracted ContentStore MBean operations
   13099: Merge V3.0 to V3.1
      13096  Merged V2.2 to V3.0
         13071: Fix ETWOTWO-1058: Hibernate exception while concurrently submitting from and updating same user sandbox.
         13079: Fix ETWOTWO-1117: Misleading exceptions reported during AVM flatten and update
   13102: [no comment]
   13112: Merged V3.0 to V3.1
      13111: Merged V2.2 to V3.0
         13110: Fix 2.1 -> 2.2 upgrade on Postgres
   13114: Build/test fix (Enterprise Remote API project does not yet have any Java files to generate Javadoc)
   13117: DM Index Check - unit test improvements
   13123: *RECORD ONLY* Removed svn:mergeinfo fluff
   13124: Used newer, more efficient NodeService.addProperties method instead of many NodeService.setProperty calls
   13125: Added M2Binding for 'child-association': propagateTimestamps'
   13126: WCM unit tests - reduce build/test time to check (async) submits
   13127: Minor test fix - to allow it to run locally (on Mac OS X)
   13130: Support for 'maxRetries' of zero or less
   13131: Merged V3.0 to V3.1
      13025 *RECORD-ONLY*: Removed unnecessary svn:mergeinfo
      13026: Merged V2.2 to V3.0
         12964: Fixed ETWOTWO-968: Space rules are not run when saving from MS Word
         12993 *RECORD-ONLY*: added openoffice bootstrap context to sample-extensions
         13009 *RECORD-ONLY*: Avoid default OOo config from causing problems on zip/gz installs
   13132: Updated svn:mergeinfo
   13134: ETHREEOH-1202 - initial fix and unit tests
   ___________________________________________________________________
   Modified: svn:mergeinfo
      Merged /alfresco/BRANCHES/V3.0:r13005,13025-13026,13030,13039,13042,13050,13053,13096,13098,13111
      Merged /alfresco/BRANCHES/V2.2:r12964,12993,13009,13071,13079,13110
      Merged /alfresco/BRANCHES/V3.1:r13077,13099,13102,13112,13114,13117,13123-13127,13130-13132,13134


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13564 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-03-11 13:19:59 +00:00
parent 9d3fd6680d
commit cf86bf466c
46 changed files with 4765 additions and 4028 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/java/org/alfresco/repo/model/filefolder/TempFileMarkerInterceptor.java
View File

@@ -91,6 +91,7 @@ public class TempFileMarkerInterceptor implements MethodInterceptor
{
FileInfo fileInfo = (FileInfo) ret;
String filename = fileInfo.getName();
NodeRef nodeRef = fileInfo.getNodeRef();
if (logger.isDebugEnabled())
{
@@ -98,6 +99,7 @@ public class TempFileMarkerInterceptor implements MethodInterceptor
}
// check against all the regular expressions
boolean matched = false;
for (String regexp : filterRegularExpressions)
{
if (!filename.matches(regexp))
@@ -107,8 +109,8 @@ public class TempFileMarkerInterceptor implements MethodInterceptor
}
else
{
matched = true;
// it matched, so apply the aspect
NodeRef nodeRef = fileInfo.getNodeRef();
nodeService.addAspect(nodeRef, ContentModel.ASPECT_TEMPORARY, null);
// no further checking required
if (logger.isDebugEnabled())
@@ -118,6 +120,17 @@ public class TempFileMarkerInterceptor implements MethodInterceptor
break;
}
}
// If there was NOT a match then the file should not be marked as temporary
// after any of the operations in question.
if (!matched && nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY))
{
// Remove the aspect
nodeService.removeAspect(nodeRef, ContentModel.ASPECT_TEMPORARY);
if (logger.isDebugEnabled())
{
logger.debug("Removed temporary marker: " + fileInfo);
}
}
}
// done
return ret;