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

ALF-11828 CIFS: NPE possible after connection failure

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32472 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2011-12-02 13:46:53 +00:00
parent 26e0b0a765
commit e74e27c982
1 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2803,25 +2803,20 @@ public class ContentDiskDriver2 extends AlfrescoDiskDriver implements ExtendedD
/* /*
* Need to work out whether content has changed. Some odd situations do not change content. * Need to work out whether content has changed. Some odd situations do not change content.
*/ */
boolean contentChanged = true;
ContentReader existingContent = contentService.getReader(target, ContentModel.PROP_CONTENT); ContentReader existingContent = contentService.getReader(target, ContentModel.PROP_CONTENT);
if(existingContent != null) if(existingContent != null)
{ {
existingContent.getSize(); existingContent.getSize();
existingContent.getMimetype(); existingContent.getMimetype();
InputStream is = existingContent.getContentInputStream(); contentChanged = isContentChanged(existingContent, tempFile);
} }
//InputStream is = new BufferedInputStream(new FileInputStream(tempFile.getFile()));
boolean contentChanged = isContentChanged(existingContent, tempFile);
if(contentChanged) if(contentChanged)
{ {
logger.debug("content has changed"); logger.debug("content has changed");
// MER END
/** /**
* Take over the behaviour of the auditable aspect * Take over the behaviour of the auditable aspect
*/ */
@@ -2853,7 +2848,7 @@ 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());
} } // if content changed
} }
} }