svn commit: r1886009 - in /manifoldcf/trunk: CHANGES.txt connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java

[kwright]

Author: kwright
Date: Fri Jan 29 11:18:50 2021
New Revision: 1886009

URL: http://svn.apache.org/viewvc?rev=1886009&view=rev
Log:
Fix for CONNECTORS-1662.  Thanks to Julien Massiera for the patch.

Modified:
    manifoldcf/trunk/CHANGES.txt
    
manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1886009&r1=1886008&r2=1886009&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Jan 29 11:18:50 2021
@@ -3,6 +3,8 @@ $Id$
 
 ======================= 2.19-dev =====================
 
+CONNECTORS-1662: Apparently sometimes JIRA doesn't form the encoding properly.
+(Julien Massiera)
 
 ======================= Release 2.18 =====================
 

Modified: 
manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java?rev=1886009&r1=1886008&r2=1886009&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java
 (original)
+++ 
manifoldcf/trunk/connectors/jira/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/jira/JiraSession.java
 Fri Jan 29 11:18:50 2021
@@ -34,6 +34,7 @@ import org.apache.manifoldcf.core.util.U
 
 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 @@ public class JiraSession {
   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;