Author: kwright
Date: Fri Sep 21 17:29:44 2018
New Revision: 1841619
URL: http://svn.apache.org/viewvc?rev=1841619&view=rev
Log:
Pull up another fix for CONNECTORS-1533.
Modified:
manifoldcf/branches/release-2.11-branch/ (props changed)
manifoldcf/branches/release-2.11-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
Propchange: manifoldcf/branches/release-2.11-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 21 17:29:44 2018
@@ -152,4 +152,4 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1841397,1841587,1841596,1841598
+/manifoldcf/trunk:1841397,1841587,1841596,1841598,1841618
Modified:
manifoldcf/branches/release-2.11-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.11-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java?rev=1841619&r1=1841618&r2=1841619&view=diff
==============================================================================
---
manifoldcf/branches/release-2.11-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
(original)
+++
manifoldcf/branches/release-2.11-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java
Fri Sep 21 17:29:44 2018
@@ -147,8 +147,7 @@ public class ModifiedHttpSolrClient exte
String url = basePath + path;
// Hack to allow short queries to go one way, and long queries to go
another.
- final String wQueryString = toQueryString(wparams, false);
- final boolean mustUseMultipart = url.length() + wQueryString.length() >
4000;
+ final boolean mustUseMultipart = request instanceof
org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;
if (mustUseMultipart) {
streams = requestWriter.getContentStreams(request);
}
@@ -166,8 +165,8 @@ public class ModifiedHttpSolrClient exte
|| (streams != null && streams.size() > 1)) && !hasNullStreamName;
LinkedList<NameValuePair> postOrPutParams = new LinkedList<>();
- if(contentWriter != null && !mustUseMultipart) {
- String fullQueryUrl = url + wQueryString;
+ if(contentWriter != null && !isMultipart) {
+ String fullQueryUrl = url + toQueryString(wparams, false);
HttpEntityEnclosingRequestBase postOrPut = SolrRequest.METHOD.POST ==
request.getMethod() ?
new HttpPost(fullQueryUrl) : new HttpPut(fullQueryUrl);
postOrPut.addHeader("Content-Type",
