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 BRANCHES/DEV/V3.3-BUG-FIX to HEAD:

Browse Source 
20623: Fix for ALF-3188 : Access Denied when updating doc via CIFS

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20630 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Steven Glover
2010-06-14 13:11:17 +00:00
parent 5ecedcf9b8
commit b1fc6f3ab7
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/java/org/alfresco/filesys/repo/ContentNetworkFile.java
View File

@@ -42,6 +42,8 @@ import org.alfresco.model.ContentModel;
import org.alfresco.repo.content.AbstractContentReader; import org.alfresco.repo.content.AbstractContentReader;
import org.alfresco.repo.content.encoding.ContentCharsetFinder; import org.alfresco.repo.content.encoding.ContentCharsetFinder;
import org.alfresco.repo.content.filestore.FileContentReader; import org.alfresco.repo.content.filestore.FileContentReader;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork;
import org.alfresco.repo.transaction.AlfrescoTransactionSupport; import org.alfresco.repo.transaction.AlfrescoTransactionSupport;
import org.alfresco.repo.transaction.TransactionListenerAdapter; import org.alfresco.repo.transaction.TransactionListenerAdapter;
import org.alfresco.service.cmr.repository.ContentAccessor; import org.alfresco.service.cmr.repository.ContentAccessor;
@@ -433,8 +435,18 @@ public class ContentNetworkFile extends NodeRefNetworkFile
// Update node properties, but only if the binary has changed (ETHREEOH-1861) // Update node properties, but only if the binary has changed (ETHREEOH-1861)
ContentReader postUpdateContentReader = ((ContentWriter) content).getReader(); ContentReader postUpdateContentReader = ((ContentWriter) content).getReader();
RunAsWork<ContentReader> getReader = new RunAsWork<ContentReader>()
{
public ContentReader doWork() throws Exception
{
return preUpdateContentURL == null ? null : contentService.getRawReader(preUpdateContentURL);
}
};
ContentReader preUpdateContentReader = AuthenticationUtil.runAs(getReader, AuthenticationUtil.getSystemUserName());
boolean contentChanged = preUpdateContentURL == null boolean contentChanged = preUpdateContentURL == null
|| !AbstractContentReader.compareContentReaders(contentService.getRawReader(preUpdateContentURL), || !AbstractContentReader.compareContentReaders(preUpdateContentReader,
postUpdateContentReader); postUpdateContentReader);
if (contentChanged) if (contentChanged)