Fix for CONNECTORS-1662. Thanks to Julien Massiera for the patch.
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/trunk@1886009 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 41d25cb..6f895ec 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,8 @@
======================= 2.19-dev =====================
+CONNECTORS-1662: Apparently sometimes JIRA doesn't form the encoding properly.
+(Julien Massiera)
======================= Release 2.18 =====================
diff --git a/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java b/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java
index 24ba2c0..6a21b5c 100644
--- a/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java
+++ b/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java
@@ -34,6 +34,7 @@
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
+import java.nio.charset.UnsupportedCharsetException;
import java.util.Map;
import java.util.HashMap;
import java.util.List;
@@ -244,16 +245,14 @@
private static Charset getCharSet(HttpEntity entity)
{
Charset charSet;
- try
- {
- ContentType ct = ContentType.get(entity);
- if (ct == null)
+ try {
+ final ContentType ct = ContentType.get(entity);
+ if (ct == null || ct.getCharset() == null) {
charSet = StandardCharsets.UTF_8;
- else
+ } else {
charSet = ct.getCharset();
- }
- catch (ParseException e)
- {
+ }
+ } catch (final ParseException | UnsupportedCharsetException e) {
charSet = StandardCharsets.UTF_8;
}
return charSet;
