From 467bc8d3c8ca2c36ea1b0d7b345b47d9595985ff Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Tue, 26 Jun 2007 21:48:19 +0000 Subject: [PATCH] Partial fix for AWC-999: Content upload guesses character encoding and offers the user the chance to change it. TODO: Fix the "Modify Content Properties" to include the encoding as a changeable option. Modified other entry points of content into the system. All calls to ContentWriter.setEncoding("UTF-8") need some serious examination. It is no longer necessary to assume anything about the encoding. The worst case scenario is that we guess the encoding from the stream without giving the user the chance to change it. This works for most non-interactive scenarios like CIFS, WebDAV and FTP, now. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@6113 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/content/encoding/ContentCharsetFinder.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/content/encoding/ContentCharsetFinder.java b/source/java/org/alfresco/repo/content/encoding/ContentCharsetFinder.java index 2e3686c905..824e337156 100644 --- a/source/java/org/alfresco/repo/content/encoding/ContentCharsetFinder.java +++ b/source/java/org/alfresco/repo/content/encoding/ContentCharsetFinder.java @@ -79,11 +79,15 @@ public class ContentCharsetFinder * * @param is a stream that will not be affected by the call, but must * support marking - * @param mimetype the mimetype of the stream data + * @param mimetype the mimetype of the stream data - null if not known * @return returns a characterset and never null */ public Charset getCharset(InputStream is, String mimetype) { + if (mimetype == null) + { + return defaultCharset; + } // Is it text? if (!mimetypeService.isText(mimetype)) {