svn commit: r1841854 - in /manifoldcf/branches/release-2.11-branch: ./ connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/ModifiedHttpSolrClient.java

[kwright]

Author: kwright
Date: Mon Sep 24 14:18:36 2018
New Revision: 1841854

URL: http://svn.apache.org/viewvc?rev=1841854&view=rev
Log:
Pull up yet another CONNECTORS-1533 fix from trunk.

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 Mon Sep 24 14:18:36 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,1841618,1841840
+/manifoldcf/trunk:1841397,1841587,1841596,1841598,1841618,1841840,1841853

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=1841854&r1=1841853&r2=1841854&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
 Mon Sep 24 14:18:36 2018
@@ -168,10 +168,11 @@ public class ModifiedHttpSolrClient exte
     if (SolrRequest.METHOD.POST == request.getMethod() || 
SolrRequest.METHOD.PUT == request.getMethod()) {
       
       // Hack to allow short queries to go one way, and long queries to go 
another.
-      final boolean mustUseMultipart = this.useMultiPartPost && request 
instanceof org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;
+      final Collection<ContentStream> requestStreams = (requestWriter 
instanceof 
org.apache.solr.client.solrj.impl.BinaryRequestWriter)?null:requestWriter.getContentStreams(request);
+      final boolean mustUseMultipart = this.useMultiPartPost && requestStreams 
!= null && requestStreams.size() > 0; //request instanceof 
org.apache.solr.client.solrj.request.ContentStreamUpdateRequest;
       if (mustUseMultipart) {
         //System.out.println("Overriding with streams");
-        streams = requestWriter.getContentStreams(request);
+        streams = requestStreams;
       }
 
       //System.out.println("Post or put");