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

Fix for ALF-11275

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Steven Glover
2011-11-07 12:17:03 +00:00
parent e932bd942e
commit f2e0b47d5d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/repo/jscript/ScriptNode.java
View File

@@ -3490,13 +3490,14 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
{ {
ContentService contentService = services.getContentService(); ContentService contentService = services.getContentService();
ContentWriter writer = contentService.getWriter(nodeRef, this.property, true); ContentWriter writer = contentService.getWriter(nodeRef, this.property, true);
InputStream is = null;
if (applyMimetype) if (applyMimetype)
{ {
writer.setMimetype(content.getMimetype()); writer.setMimetype(content.getMimetype());
} }
if (guessEncoding) if (guessEncoding)
{ {
InputStream is = new BufferedInputStream(content.getInputStream()); is = new BufferedInputStream(content.getInputStream());
is.mark(1024); is.mark(1024);
writer.setEncoding(guessEncoding(is, false)); writer.setEncoding(guessEncoding(is, false));
try try
@@ -3510,8 +3511,9 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
else else
{ {
writer.setEncoding(content.getEncoding()); writer.setEncoding(content.getEncoding());
is = content.getInputStream();
} }
writer.putContent(content.getInputStream()); writer.putContent(is);
// update cached variables after putContent() // update cached variables after putContent()
this.contentData = (ContentData) services.getNodeService().getProperty(nodeRef, this.property); this.contentData = (ContentData) services.getNodeService().getProperty(nodeRef, this.property);