svn commit: r1625447 - in /manifoldcf/branches/release-1.7-branch: ./ CHANGES.txt connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java

[kwright]

Author: kwright
Date: Wed Sep 17 01:12:04 2014
New Revision: 1625447

URL: http://svn.apache.org/r1625447
Log:
Pull up fix for CONNECTORS-1014 from dev_1x branch

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

Propchange: manifoldcf/branches/release-1.7-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/branches/dev_1x:r1620863
  Merged /manifoldcf/trunk:r1620862

Modified: manifoldcf/branches/release-1.7-branch/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/CHANGES.txt?rev=1625447&r1=1625446&r2=1625447&view=diff
==============================================================================
--- manifoldcf/branches/release-1.7-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.7-branch/CHANGES.txt Wed Sep 17 01:12:04 2014
@@ -8,6 +8,10 @@ CONNECTORS-1031: Fix Zookeeper synchroni
 against short tick time settings.
 (Karl Wright)
 
+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/release-1.7-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java?rev=1625447&r1=1625446&r2=1625447&view=diff
==============================================================================
--- 
manifoldcf/branches/release-1.7-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java
 (original)
+++ 
manifoldcf/branches/release-1.7-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrServer.java
 Wed Sep 17 01:12:04 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;