You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2020/05/04 03:21:24 UTC
[james-project] 05/12: JAMES-2997 DefaultTextExtractor need to
handle correctly charset
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 1b4e0c81d62c0d6684da0d49351c9f94083e58e0
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Apr 27 19:38:11 2020 +0700
JAMES-2997 DefaultTextExtractor need to handle correctly charset
---
.../apache/james/mailbox/store/extractor/DefaultTextExtractor.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java b/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java
index ea4d76b..65c03bb 100644
--- a/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java
+++ b/mailbox/store/src/main/java/org/apache/james/mailbox/store/extractor/DefaultTextExtractor.java
@@ -20,6 +20,7 @@
package org.apache.james.mailbox.store.extractor;
import java.io.InputStream;
+import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Optional;
@@ -39,7 +40,8 @@ public class DefaultTextExtractor implements TextExtractor {
@Override
public ParsedContent extractContent(InputStream inputStream, ContentType contentType) throws Exception {
if (contentType != null && contentType.asString().startsWith("text/")) {
- return new ParsedContent(Optional.ofNullable(IOUtils.toString(inputStream, StandardCharsets.UTF_8)), new HashMap<>());
+ Charset charset = contentType.charset().orElse(StandardCharsets.UTF_8);
+ return new ParsedContent(Optional.ofNullable(IOUtils.toString(inputStream, charset)), new HashMap<>());
} else {
return new ParsedContent(Optional.empty(), new HashMap<>());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org