svn commit: r1620862 - in /manifoldcf/trunk: CHANGES.txt connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java

[kw...@apache.org]

Author: kwright
Date: Wed Aug 27 11:14:52 2014
New Revision: 1620862

URL: http://svn.apache.org/r1620862
Log:
Fix for CONNECTORS-1014.

Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1620862&r1=1620861&r2=1620862&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Aug 27 11:14:52 2014
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 2.0-dev =====================
 
+CONNECTORS-1014: Fix the fact that Solr Cloud no longer sets
+a content type in its responses.
+(Kamil Zyta, Karl Wright)
+
 CONNECTORS-1006: Extend GoogleDrive connector to capture
 Google native spreadsheets.
 (Shigeki Kabayashi)

Modified: manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java?rev=1620862&r1=1620861&r2=1620862&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java (original)
+++ manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java Wed Aug 27 11:14:52 2014
@@ -312,7 +312,12 @@ public class ModifiedHttpSolrServer exte
         shouldClose = false;
         return rsp;
       }
-      String charset = ContentType.getOrDefault(response.getEntity()).getCharset().name();
+      Charset charsetObject = ContentType.getOrDefault(response.getEntity()).getCharset();
+      String charset;
+      if (charsetObject != null)
+        charset = charsetObject.name();
+      else
+        charset = "utf-8";
       NamedList<Object> rsp = processor.processResponse(respBody, charset);
       if (httpStatus != HttpStatus.SC_OK) {
         String reason = null;