Author: kwright
Date: Thu Jun 29 01:42:19 2017
New Revision: 1800219
URL: http://svn.apache.org/viewvc?rev=1800219&view=rev
Log:
Fix for CONNECTORS-1438.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1800219&r1=1800218&r2=1800219&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Thu Jun 29 01:42:19 2017
@@ -3,6 +3,10 @@ $Id$
======================= 2.8-dev =====================
+CONNECTORS-1438: Wrong content-type parse in Solr connector caused
+failure when content type contained a charset.
+(Kenta Kasahara, Karl Wright)
+
CONNECTORS-1434: Escape filenames in Solr Http headers to match spec.
This is a workaround for a fix that really should be in HttpClient.
(Karl Wright, Tamizh Kumaran Thamizharasan)
Modified:
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java?rev=1800219&r1=1800218&r2=1800219&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
(original)
+++
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
Thu Jun 29 01:42:19 2017
@@ -196,7 +196,7 @@ public class ModifiedHttpSolrClient exte
parts.add(new FormBodyPart(encodeForHeader(name),
new InputStreamBody(
content.getStream(),
- contentType,
+ ContentType.parse(contentType),
encodeForHeader(content.getName()))));
}
}
