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

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
68536: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68314: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68272: MNT-11349: Merged V4.1.7 (4.1.7.9) to V4.1-BUG-FIX (4.1.9)
            67241: MNT-11185 : 4.1.7.7HF calls onContentUpdate policies twice when using ftp or cifs (once with webdav)
               - Remove ASPECT_NO_CONTENT after content is added


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70417 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-05-16 16:35:51 +00:00
parent ca174bab71
commit 6a0ead3dc1
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/filesys/repo/ContentDiskDriver2.java
View File

@@ -2931,15 +2931,6 @@ public class ContentDiskDriver2 extends AlfrescoDiskDriver implements ExtendedD
lockKeeper.removeLock(target); lockKeeper.removeLock(target);
if(nodeService.hasAspect(target, ContentModel.ASPECT_NO_CONTENT))
{
if(logger.isDebugEnabled())
{
logger.debug("removed no content aspect");
}
nodeService.removeAspect(target, ContentModel.ASPECT_NO_CONTENT);
}
if(tempFile.isChanged()) if(tempFile.isChanged())
{ {
tempFile.flushFile(); tempFile.flushFile();
@@ -3018,6 +3009,16 @@ public class ContentDiskDriver2 extends AlfrescoDiskDriver implements ExtendedD
writer.setMimetype(mimetype); writer.setMimetype(mimetype);
writer.setEncoding(encoding); writer.setEncoding(encoding);
writer.putContent(tempFile.getFile()); writer.putContent(tempFile.getFile());
// remove ASPECT_NO_CONTENT after content is present
if(nodeService.hasAspect(target, ContentModel.ASPECT_NO_CONTENT))
{
if(logger.isDebugEnabled())
{
logger.debug("removed no content aspect");
}
nodeService.removeAspect(target, ContentModel.ASPECT_NO_CONTENT);
}
} // if content changed } // if content changed
} }
} }