manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1620863 - in /manifoldcf/branches/dev_1x: ./ CHANGES.txt connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java
Date Wed, 27 Aug 2014 11:16:32 GMT
Author: kwright
Date: Wed Aug 27 11:16:32 2014
New Revision: 1620863

URL: http://svn.apache.org/r1620863
Log:
Pull up fix for CONNECTORS-1014 from trunk.

Modified:
    manifoldcf/branches/dev_1x/   (props changed)
    manifoldcf/branches/dev_1x/CHANGES.txt
    manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java

Propchange: manifoldcf/branches/dev_1x/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1620862

Modified: manifoldcf/branches/dev_1x/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/CHANGES.txt?rev=1620863&r1=1620862&r2=1620863&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/CHANGES.txt (original)
+++ manifoldcf/branches/dev_1x/CHANGES.txt Wed Aug 27 11:16:32 2014
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 1.8-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/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java
URL: http://svn.apache.org/viewvc/manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java?rev=1620863&r1=1620862&r2=1620863&view=diff
==============================================================================
--- manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java
(original)
+++ manifoldcf/branches/dev_1x/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java
Wed Aug 27 11:16:32 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;



Mime
View raw message