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 (unreported?) issue where uploaded large files via upload.post.js does not work after recent optimizations

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31214 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2011-10-13 15:06:50 +00:00
parent 036d25811a
commit e89ec2ac6c
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,7 @@
*/
package org.alfresco.repo.jscript;
import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -3488,7 +3489,16 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
}
if (guessEncoding)
{
writer.setEncoding(guessEncoding(content.getInputStream()));
InputStream is = new BufferedInputStream(content.getInputStream());
is.mark(1024);
writer.setEncoding(guessEncoding(is, false));
try
{
is.reset();
}
catch (IOException e)
{
}
}
else
{
@@ -3618,10 +3628,10 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
*/
public void guessEncoding()
{
setEncoding(guessEncoding(getInputStream()));
setEncoding(guessEncoding(getInputStream(), true));
}
private String guessEncoding(InputStream in)
private String guessEncoding(InputStream in, boolean close)
{
String encoding = "UTF-8";
try
@@ -3636,7 +3646,7 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider
{
try
{
if (in != null)
if (close && in != null)
{
in.close();
}